[packages/percona-server/v5.0.x: 166/202] - revert unwanted patches overwrite
glen
glen at pld-linux.org
Wed Oct 21 16:22:59 CEST 2015
commit 3d10d79748e3779ada08e05cc78ad2db7ebf9492
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Sat Mar 12 14:54:49 2011 +0000
- revert unwanted patches overwrite
Changed files:
mysql-microslow_innodb.patch -> 1.1.2.15
mysql-userstatv2.patch -> 1.1.2.17
mysql.spec -> 1.353.2.103
mysql-microslow_innodb.patch | 13 ++++++------
mysql-userstatv2.patch | 50 +++++++-------------------------------------
mysql.spec | 2 +-
3 files changed, 15 insertions(+), 50 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index d1df739..16279e3 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -25,7 +25,7 @@ Summary(uk.UTF-8): MySQL - швидкий SQL-сервер
Summary(zh_CN.UTF-8): MySQL数据库服务器
Name: mysql
Version: 5.0.92
-Release: 2
+Release: 3
License: GPL + MySQL FLOSS Exception
Group: Applications/Databases
Source0: ftp://gd.tuwien.ac.at/db/mysql/Downloads/MySQL-5.0/%{name}-%{version}.tar.gz
diff --git a/mysql-microslow_innodb.patch b/mysql-microslow_innodb.patch
index c4bf18e..5304e05 100644
--- a/mysql-microslow_innodb.patch
+++ b/mysql-microslow_innodb.patch
@@ -2178,9 +2178,8 @@ diff -ruN a/sql/sql_class.cc b/sql/sql_class.cc
}
-diff -ruN a/sql/sql_class.h b/sql/sql_class.h
---- a/sql/sql_class.h Tue Jul 28 23:39:12 2009 -0700
-+++ b/sql/sql_class.h Tue Jul 28 23:42:44 2009 -0700
+--- mysql-5.0.92/sql/sql_class.h Tue Jul 28 23:39:12 2009 -0700
++++ mysql-5.0.92/sql/sql_class.h Tue Jul 28 23:42:44 2009 -0700
@@ -43,6 +43,7 @@
extern char internal_table_name[2];
extern char empty_c_string[1];
@@ -2278,7 +2277,7 @@ diff -ruN a/sql/sql_class.h b/sql/sql_class.h
/* <> 0 if we are inside of trigger or stored function. */
uint in_sub_stmt;
-@@ -1702,11 +1732,11 @@
+@@ -1732,11 +1732,11 @@
sql_print_information("time() failed with %d", errno);
}
@@ -2292,9 +2291,9 @@ diff -ruN a/sql/sql_class.h b/sql/sql_class.h
+ inline void end_time() { end_timer(); safe_time(&start_time); }
+ inline void set_time(time_t t) { set_timer(); time_after_lock=start_time=user_time=t; }
+ inline void lock_time() { lock_timer(); safe_time(&time_after_lock); }
- inline void insert_id(ulonglong id_arg)
- {
- last_insert_id= id_arg;
+ /*TODO: this will be obsolete when we have support for 64 bit my_time_t */
+ inline bool is_valid_time()
+ {
diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
--- a/sql/sql_parse.cc Tue Jul 28 23:39:12 2009 -0700
+++ b/sql/sql_parse.cc Tue Jul 28 23:42:44 2009 -0700
diff --git a/mysql-userstatv2.patch b/mysql-userstatv2.patch
index 6eb4e3d..6393c09 100644
--- a/mysql-userstatv2.patch
+++ b/mysql-userstatv2.patch
@@ -1147,39 +1147,6 @@ diff -ruN a/netware/Makefile.in b/netware/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -ruN a/os2/Makefile.in b/os2/Makefile.in
---- a/os2/Makefile.in Wed Jul 29 13:33:34 2009 -0700
-+++ b/os2/Makefile.in Wed Jul 29 13:34:11 2009 -0700
-@@ -156,6 +156,7 @@
- LIBDL = @LIBDL@
- LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
- LIBOBJS = @LIBOBJS@
-+LIBRT = @LIBRT@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -ruN a/os2/include/Makefile.in b/os2/include/Makefile.in
---- a/os2/include/Makefile.in Wed Jul 29 13:33:34 2009 -0700
-+++ b/os2/include/Makefile.in Wed Jul 29 13:34:11 2009 -0700
-@@ -156,6 +156,7 @@
- LIBDL = @LIBDL@
- LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
- LIBOBJS = @LIBOBJS@
-+LIBRT = @LIBRT@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -ruN a/os2/include/sys/Makefile.in b/os2/include/sys/Makefile.in
---- a/os2/include/sys/Makefile.in Wed Jul 29 13:33:34 2009 -0700
-+++ b/os2/include/sys/Makefile.in Wed Jul 29 13:34:11 2009 -0700
-@@ -144,6 +144,7 @@
- LIBDL = @LIBDL@
- LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
- LIBOBJS = @LIBOBJS@
-+LIBRT = @LIBRT@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
diff -ruN /dev/null b/patch_info/userstats.info
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patch_info/userstats.info Wed Jul 29 13:34:11 2009 -0700
@@ -3487,9 +3454,8 @@ diff -ruN a/sql/sql_prepare.cc b/sql/sql_prepare.cc
DBUG_VOID_RETURN;
}
-diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
---- a/sql/sql_show.cc Wed Jul 29 13:33:34 2009 -0700
-+++ b/sql/sql_show.cc Wed Jul 29 13:34:11 2009 -0700
+--- mysql-5.0.92/sql/sql_show.cc~ 2011-02-24 15:55:10.000000000 +0200
++++ mysql-5.0.92/sql/sql_show.cc 2011-02-24 15:56:28.993570019 +0200
@@ -540,6 +540,7 @@
sctx->master_access);
if (!(db_access & DB_ACLS) && (!grant_option || check_grant_db(thd,dbname)))
@@ -3877,13 +3843,13 @@ diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
/*
Description of ST_FIELD_INFO in table.h
-@@ -4504,6 +4870,8 @@
+@@ -4906,6 +4906,8 @@
{
- {"CHARACTER_SETS", charsets_fields_info, create_schema_table,
+ {"CHARACTER_SETS", charsets_fields_info, create_schema_table,
fill_schema_charsets, make_character_sets_old_format, 0, -1, -1, 0},
+ {"CLIENT_STATISTICS", client_stats_fields_info, create_schema_table,
+ fill_schema_client_stats, make_old_format, 0, -1, -1, 0},
- {"COLLATIONS", collation_fields_info, create_schema_table,
+ {"COLLATIONS", collation_fields_info, create_schema_table,
fill_schema_collation, make_old_format, 0, -1, -1, 0},
{"COLLATION_CHARACTER_SET_APPLICABILITY", coll_charset_app_fields_info,
@@ -4512,6 +4880,8 @@
@@ -3895,7 +3861,7 @@ diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
{"KEY_COLUMN_USAGE", key_column_usage_fields_info, create_schema_table,
get_all_tables, 0, get_schema_key_column_usage_record, 4, 5, 0},
{"OPEN_TABLES", open_tables_fields_info, create_schema_table,
-@@ -4537,10 +4907,14 @@
+@@ -4941,10 +4943,14 @@
get_all_tables, make_table_names_old_format, 0, 1, 2, 1},
{"TABLE_PRIVILEGES", table_privileges_fields_info, create_schema_table,
fill_schema_table_privileges, 0, 0, -1, -1, 0},
@@ -3903,13 +3869,13 @@ diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
+ fill_schema_table_stats, make_old_format, 0, -1, -1, 0},
{"TRIGGERS", triggers_fields_info, create_schema_table,
get_all_tables, make_old_format, get_schema_triggers_record, 5, 6, 0},
- {"USER_PRIVILEGES", user_privileges_fields_info, create_schema_table,
+ {"USER_PRIVILEGES", user_privileges_fields_info, create_schema_table,
fill_schema_user_privileges, 0, 0, -1, -1, 0},
+ {"USER_STATISTICS", user_stats_fields_info, create_schema_table,
+ fill_schema_user_stats, make_old_format, 0, -1, -1, 0},
{"VARIABLES", variables_fields_info, create_schema_table, fill_variables,
make_old_format, 0, -1, -1, 1},
- {"VIEWS", view_fields_info, create_schema_table,
+ {"VIEWS", view_fields_info, create_schema_table,
diff -ruN a/sql/sql_update.cc b/sql/sql_update.cc
--- a/sql/sql_update.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/sql_update.cc Wed Jul 29 13:34:11 2009 -0700
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/percona-server.git/commitdiff/431f68fe79a66d5dfdd53f2655709e6c925fbc22
More information about the pld-cvs-commit
mailing list