packages (MYSQL_5_1): mysql/bug53761.patch, mysql/innodb_bug47167_test_fix....
arekm
arekm at pld-linux.org
Sat Nov 19 16:02:23 CET 2011
Author: arekm Date: Sat Nov 19 15:02:23 2011 GMT
Module: packages Tag: MYSQL_5_1
---- Log message:
- up to 5.1.59 + update percona patches
---- Files affected:
packages/mysql:
bug53761.patch (1.1.2.1 -> 1.1.2.2) , innodb_bug47167_test_fix.patch (1.1.2.1 -> 1.1.2.2) , mysql-bug580324.patch (1.1.2.2.4.1 -> 1.1.2.2.4.2) , mysql-bugfix48929.patch (1.1.2.2.4.1 -> 1.1.2.2.4.2) , mysql-control_online_alter_index.patch (1.1.2.2.4.1 -> 1.1.2.2.4.2) , mysql-error_pad.patch (1.1.2.2.4.1 -> 1.1.2.2.4.2) , mysql-i_s_innodb_buffer_pool_pages.patch (1.1.2.3.4.1 -> 1.1.2.3.4.2) , mysql-innodb_adjust_defaults.patch (1.1.2.3.4.1 -> 1.1.2.3.4.2) , mysql-innodb_admin_command_base.patch (1.1.2.3.4.1 -> 1.1.2.3.4.2) , mysql-innodb_buffer_pool_shm.patch (1.1.2.3.4.1 -> 1.1.2.3.4.2) , mysql-innodb_deadlock_count.patch (1.1.2.4.4.1 -> 1.1.2.4.4.2) , mysql-innodb_dict_size_limit.patch (1.2.2.3.4.1 -> 1.2.2.3.4.2) , mysql-innodb_expand_fast_index_creation.patch (1.1.2.1.4.1 -> 1.1.2.1.4.2) , mysql-innodb_expand_import.patch (1.1.2.4.4.1 -> 1.1.2.4.4.2) , mysql-innodb_expand_undo_slots.patch (1.1.2.3.4.1 -> 1.1.2.3.4.2) , mysql-innodb_extend_slow.patch (1.2.2.3.4.1 -> 1.2.2.3.4.2) , mysql-innodb_extra_rseg.patch (1.2.2.3.4.1 -> 1.2.2.3.4.2) , mysql-innodb_fast_checksum.patch (1.1.2.4.4.1 -> 1.1.2.4.4.2) , mysql-innodb_fast_shutdown.patch (1.1.2.2.4.1 -> 1.1.2.2.4.2) , mysql-innodb_files_extend.patch (1.1.2.4.4.1 -> 1.1.2.4.4.2) , mysql-innodb_fix_misc.patch (1.1.2.5.4.1 -> 1.1.2.5.4.2) , mysql-innodb_io_patches.patch (1.1.4.3.4.1 -> 1.1.4.3.4.2) , mysql-innodb_lru_dump_restore.patch (1.1.2.4.4.1 -> 1.1.2.4.4.2) , mysql-innodb_opt_lru_count.patch (1.1.2.2.4.1 -> 1.1.2.2.4.2) , mysql-innodb_overwrite_relay_log_info.patch (1.1.2.3.4.1 -> 1.1.2.3.4.2) , mysql-innodb_pass_corrupt_table.patch (1.1.2.4.4.1 -> 1.1.2.4.4.2) , mysql-innodb_purge_thread.patch (1.1.2.3.4.1 -> 1.1.2.3.4.2) , mysql-innodb_recovery_patches.patch (1.1.4.3.4.1 -> 1.1.4.3.4.2) , mysql-innodb_separate_doublewrite.patch (1.1.2.4.4.1 -> 1.1.2.4.4.2) , mysql-innodb_show_enhancements.patch (1.1.2.3.4.1 -> 1.1.2.3.4.2) , mysql-innodb_show_lock_name.patch (1.1.2.3.4.1 -> 1.1.2.3.4.2) , mysql-innodb_show_status.patch (1.1.2.3.4.1 -> 1.1.2.3.4.2) , mysql-innodb_show_sys_tables.patch (1.1.2.3.4.1 -> 1.1.2.3.4.2) , mysql-innodb_split_buf_pool_mutex.patch (1.3.2.2.4.1 -> 1.3.2.2.4.2) , mysql-innodb_stats.patch (1.1.2.3.4.1 -> 1.1.2.3.4.2) , mysql-innodb_swap_builtin_plugin.patch (1.1.2.4.4.1 -> 1.1.2.4.4.2) , mysql-innodb_thread_concurrency_timer_based.patch (1.2.2.3.4.1 -> 1.2.2.3.4.2) , mysql-log_connection_error.patch (1.1.2.2.4.1 -> 1.1.2.2.4.2) , mysql-mysql-syslog.patch (1.1.2.2.4.1 -> 1.1.2.2.4.2) , mysql-mysql_remove_eol_carret.patch (1.1.2.2.4.1 -> 1.1.2.2.4.2) , mysql-optimizer_fix.patch (1.1.2.3.4.1 -> 1.1.2.3.4.2) , mysql-profiling_slow.patch (1.2.2.3.4.1 -> 1.2.2.3.4.2) , mysql-query_cache_enhance.patch (1.1.2.3.4.1 -> 1.1.2.3.4.2) , mysql-show_patches.patch (1.1.4.3.4.1 -> 1.1.4.3.4.2) , mysql-show_slave_status_nolock.patch (1.1.2.2.4.1 -> 1.1.2.2.4.2) , mysql-show_temp_51.patch (1.1.2.3.4.1 -> 1.1.2.3.4.2) , mysql-slow_extended.patch (1.1.2.3.4.1 -> 1.1.2.3.4.2) , mysql-sql_no_fcache.patch (1.1.2.2.4.1 -> 1.1.2.2.4.2) , mysql-suppress_log_warning_1592.patch (1.1.2.3.4.1 -> 1.1.2.3.4.2) , mysql-userstat.patch (1.2.2.3.4.1 -> 1.2.2.3.4.2) , mysql.spec (1.496.2.12.4.1 -> 1.496.2.12.4.2) , response_time_distribution.patch (1.7.2.1 -> 1.7.2.2) , utf8_general50_ci.patch (1.1.2.1 -> 1.1.2.2) , bug45702.patch (NONE -> 1.1.2.1) (NEW), bug860910.patch (NONE -> 1.1.2.1) (NEW), innodb_fake_changes.patch (NONE -> 1.1.2.1) (NEW), innodb_kill_idle_transaction.patch (NONE -> 1.1.2.1) (NEW), subunit.patch (NONE -> 1.1.2.1) (NEW), warning_fixes.patch (NONE -> 1.1.2.1) (NEW)
---- Diffs:
================================================================
Index: packages/mysql/bug53761.patch
diff -u packages/mysql/bug53761.patch:1.1.2.1 packages/mysql/bug53761.patch:1.1.2.2
--- packages/mysql/bug53761.patch:1.1.2.1 Fri Sep 16 21:49:25 2011
+++ packages/mysql/bug53761.patch Sat Nov 19 16:02:15 2011
@@ -5,7 +5,7 @@
#
--- a/storage/innodb_plugin/btr/btr0cur.c
+++ b/storage/innodb_plugin/btr/btr0cur.c
-@@ -3117,6 +3117,7 @@
+@@ -3238,6 +3238,7 @@
{
btr_path_t* slot;
rec_t* rec;
@@ -13,7 +13,7 @@
ut_a(cursor->path_arr);
-@@ -3139,8 +3140,155 @@
+@@ -3260,8 +3261,155 @@
slot = cursor->path_arr + (root_height - height);
@@ -170,7 +170,7 @@
}
/*******************************************************************//**
-@@ -3165,6 +3313,7 @@
+@@ -3286,6 +3434,7 @@
ibool diverged_lot;
ulint divergence_level;
ib_int64_t n_rows;
@@ -178,7 +178,7 @@
ulint i;
mtr_t mtr;
-@@ -3207,6 +3356,7 @@
+@@ -3328,6 +3477,7 @@
/* We have the path information for the range in path1 and path2 */
n_rows = 1;
@@ -186,7 +186,7 @@
diverged = FALSE; /* This becomes true when the path is not
the same any more */
diverged_lot = FALSE; /* This becomes true when the paths are
-@@ -3222,7 +3372,7 @@
+@@ -3343,7 +3493,7 @@
if (slot1->nth_rec == ULINT_UNDEFINED
|| slot2->nth_rec == ULINT_UNDEFINED) {
@@ -195,7 +195,7 @@
/* In trees whose height is > 1 our algorithm
tends to underestimate: multiply the estimate
by 2: */
-@@ -3234,7 +3384,9 @@
+@@ -3355,7 +3505,9 @@
to over 1 / 2 of the estimated rows in the whole
table */
@@ -206,7 +206,7 @@
n_rows = index->table->stat_n_rows / 2;
/* If there are just 0 or 1 rows in the table,
-@@ -3260,10 +3412,15 @@
+@@ -3381,10 +3533,15 @@
divergence_level = i;
}
} else {
@@ -226,7 +226,7 @@
}
} else if (diverged && !diverged_lot) {
-@@ -3287,8 +3444,9 @@
+@@ -3408,8 +3565,9 @@
}
} else if (diverged_lot) {
@@ -240,7 +240,7 @@
}
--- a/storage/innodb_plugin/include/btr0cur.h
+++ b/storage/innodb_plugin/include/btr0cur.h
-@@ -652,6 +652,11 @@
+@@ -670,6 +670,11 @@
order); value ULINT_UNDEFINED
denotes array end */
ulint n_recs; /*!< number of records on the page */
@@ -407,3 +407,66 @@
SELECT COUNT(*) FROM
(SELECT * FROM t1 FORCE INDEX (idx,PRIMARY)
WHERE a BETWEEN 2 AND 7 OR pk=1000000) AS t;
+--- a/mysql-test/r/index_merge_innodb.result
++++ b/mysql-test/r/index_merge_innodb.result
+@@ -346,7 +346,7 @@
+ FROM t1
+ WHERE c = 1 AND b = 1 AND d = 1;
+ id select_type table type possible_keys key key_len ref rows Extra
+-1 SIMPLE t1 index_merge c,bd c,bd 5,10 NULL 1 Using intersect(c,bd); Using where; Using index
++1 SIMPLE t1 ref c,bd bd 10 const,const 2 Using where
+ CREATE TABLE t2 ( a INT )
+ SELECT a
+ FROM t1
+--- a/mysql-test/r/rowid_order_innodb.result
++++ b/mysql-test/r/rowid_order_innodb.result
+@@ -15,7 +15,7 @@
+ (10, 1, 1);
+ explain select * from t1 force index(key1, key2) where key1 < 3 or key2 < 3;
+ id select_type table type possible_keys key key_len ref rows Extra
+-1 SIMPLE t1 index_merge key1,key2 key1,key2 5,5 NULL 4 Using sort_union(key1,key2); Using where
++1 SIMPLE t1 index_merge key1,key2 key1,key2 5,5 NULL 5 Using sort_union(key1,key2); Using where
+ select * from t1 force index(key1, key2) where key1 < 3 or key2 < 3;
+ pk1 key1 key2
+ -100 1 1
+--- a/mysql-test/r/type_bit_innodb.result
++++ b/mysql-test/r/type_bit_innodb.result
+@@ -233,7 +233,7 @@
+ 127 403
+ explain select a+0, b+0 from t1 where a > 40 and b > 200 order by 1;
+ id select_type table type possible_keys key key_len ref rows Extra
+-1 SIMPLE t1 range a a 2 NULL 19 Using where; Using index; Using filesort
++1 SIMPLE t1 range a a 2 NULL 27 Using where; Using index; Using filesort
+ select a+0, b+0 from t1 where a > 40 and b > 200 order by 1;
+ a+0 b+0
+ 44 307
+--- a/mysql-test/r/endspace.result
++++ b/mysql-test/r/endspace.result
+@@ -201,12 +201,12 @@
+ text1
+ teststring
+ teststring
+-select text1, length(text1) from t1 where text1='teststring' or text1 like 'teststring_%';
++select text1, length(text1) from t1 where text1='teststring' or text1 like 'teststring_%' order by 1, 2;
+ text1 length(text1)
+ teststring 11
+ teststring 10
+ teststring 11
+-select text1, length(text1) from t1 where text1='teststring' or text1 >= 'teststring\t';
++select text1, length(text1) from t1 where text1='teststring' or text1 >= 'teststring\t' order by 1, 2;
+ text1 length(text1)
+ teststring 11
+ teststring 10
+--- a/mysql-test/t/endspace.test
++++ b/mysql-test/t/endspace.test
+@@ -93,8 +93,8 @@
+ select * from t1 where text1 like 'teststring_%';
+
+ # The following gives wrong result in InnoDB
+-select text1, length(text1) from t1 where text1='teststring' or text1 like 'teststring_%';
+-select text1, length(text1) from t1 where text1='teststring' or text1 >= 'teststring\t';
++select text1, length(text1) from t1 where text1='teststring' or text1 like 'teststring_%' order by 1, 2;
++select text1, length(text1) from t1 where text1='teststring' or text1 >= 'teststring\t' order by 1, 2;
+ select concat('|', text1, '|') from t1 order by text1;
+ drop table t1;
+
================================================================
Index: packages/mysql/innodb_bug47167_test_fix.patch
diff -u packages/mysql/innodb_bug47167_test_fix.patch:1.1.2.1 packages/mysql/innodb_bug47167_test_fix.patch:1.1.2.2
--- packages/mysql/innodb_bug47167_test_fix.patch:1.1.2.1 Fri Sep 16 21:49:25 2011
+++ packages/mysql/innodb_bug47167_test_fix.patch Sat Nov 19 16:02:15 2011
@@ -42,11 +42,3 @@
# Following are negative tests, all should fail.
--disable_warnings
---- a/mysql-test/include/have_innodb.inc
-+++ b/mysql-test/include/have_innodb.inc
-@@ -1,4 +1,4 @@
--if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED')`)
-+if (`select count(*)>0 from information_schema.plugins where plugin_name like 'xtradb%'`)
- {
- --skip Test requires InnoDB.
- }
================================================================
Index: packages/mysql/mysql-bug580324.patch
diff -u packages/mysql/mysql-bug580324.patch:1.1.2.2.4.1 packages/mysql/mysql-bug580324.patch:1.1.2.2.4.2
--- packages/mysql/mysql-bug580324.patch:1.1.2.2.4.1 Fri Sep 16 21:49:25 2011
+++ packages/mysql/mysql-bug580324.patch Sat Nov 19 16:02:15 2011
@@ -24,7 +24,7 @@
int4store(key + key_length, thd->server_id);
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
-@@ -1342,10 +1342,12 @@
+@@ -1344,10 +1344,12 @@
break;
#else
{
@@ -39,7 +39,7 @@
/* used as fields initializator */
lex_start(thd);
-@@ -1357,26 +1359,22 @@
+@@ -1359,26 +1361,22 @@
/*
We have name + wildcard in packet, separated by endzero
*/
@@ -77,7 +77,7 @@
if (is_schema_db(table_list.db, table_list.db_length))
{
-@@ -1385,9 +1383,6 @@
+@@ -1387,9 +1385,6 @@
table_list.schema_table= schema_table;
}
@@ -89,7 +89,7 @@
if (lower_case_table_names)
--- a/strings/ctype-utf8.c
+++ b/strings/ctype-utf8.c
-@@ -4116,6 +4116,10 @@
+@@ -4118,6 +4118,10 @@
{
int code;
char hex[]= "0123456789abcdef";
================================================================
Index: packages/mysql/mysql-bugfix48929.patch
diff -u packages/mysql/mysql-bugfix48929.patch:1.1.2.2.4.1 packages/mysql/mysql-bugfix48929.patch:1.1.2.2.4.2
--- packages/mysql/mysql-bugfix48929.patch:1.1.2.2.4.1 Fri Sep 16 21:49:25 2011
+++ packages/mysql/mysql-bugfix48929.patch Sat Nov 19 16:02:15 2011
@@ -18,7 +18,7 @@
sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
-@@ -55,6 +55,10 @@
+@@ -56,6 +56,10 @@
#include "sp_rcontext.h"
#include "sp_cache.h"
@@ -29,16 +29,25 @@
#define mysqld_charset &my_charset_latin1
#ifdef HAVE_purify
-@@ -5136,28 +5140,49 @@
+@@ -5137,31 +5141,58 @@
+ #ifndef EMBEDDED_LIBRARY
+ pthread_handler_t handle_connections_sockets(void *arg __attribute__((unused)))
{
- my_socket sock,new_sock;
+- my_socket sock,new_sock;
++ my_socket UNINIT_VAR(sock),new_sock;
uint error_count=0;
- uint max_used_connection= (uint) (max(ip_sock,unix_sock)+1);
- fd_set readFDs,clientFDs;
THD *thd;
struct sockaddr_in cAddr;
- int ip_flags=0,socket_flags=0,flags;
-+ int ip_flags=0,socket_flags=0,flags,retval;
++#if !defined(HAVE_POLL)
++ int ip_flags= 0;
++#endif
++#if defined(HAVE_SYS_UN_H) && !defined(HAVE_POLL)
++ int socket_flags= 0;
++#endif
++ int UNINIT_VAR(flags),retval;
st_vio *vio_tmp;
+#ifdef HAVE_POLL
+ int socket_count= 0;
@@ -66,8 +75,9 @@
+ socket_count++;
+#else
FD_SET(ip_sock,&clientFDs);
+-#ifdef HAVE_FCNTL
+#endif
- #ifdef HAVE_FCNTL
++#if !defined (HAVE_POLL) && defined(HAVE_FCNTL)
ip_flags = fcntl(ip_sock, F_GETFL, 0);
#endif
}
@@ -78,11 +88,13 @@
+ socket_count++;
+#else
FD_SET(unix_sock,&clientFDs);
+-#ifdef HAVE_FCNTL
+#endif
- #ifdef HAVE_FCNTL
++#if defined(HAVE_FCNTL) && defined(HAVE_SYS_UN_H) && !defined(HAVE_POLL)
socket_flags=fcntl(unix_sock, F_GETFL, 0);
#endif
-@@ -5167,12 +5192,15 @@
+ #endif
+@@ -5170,12 +5201,15 @@
MAYBE_BROKEN_SYSCALL;
while (!abort_loop)
{
@@ -103,7 +115,7 @@
{
if (socket_errno != SOCKET_EINTR)
{
-@@ -5182,7 +5210,7 @@
+@@ -5185,7 +5219,7 @@
MAYBE_BROKEN_SYSCALL
continue;
}
@@ -112,7 +124,7 @@
if (abort_loop)
{
MAYBE_BROKEN_SYSCALL;
-@@ -5190,6 +5218,21 @@
+@@ -5193,6 +5227,21 @@
}
/* Is this a new connection request ? */
@@ -134,7 +146,7 @@
#ifdef HAVE_SYS_UN_H
if (FD_ISSET(unix_sock,&readFDs))
{
-@@ -5197,11 +5240,12 @@
+@@ -5200,11 +5249,12 @@
flags= socket_flags;
}
else
================================================================
Index: packages/mysql/mysql-control_online_alter_index.patch
diff -u packages/mysql/mysql-control_online_alter_index.patch:1.1.2.2.4.1 packages/mysql/mysql-control_online_alter_index.patch:1.1.2.2.4.2
--- packages/mysql/mysql-control_online_alter_index.patch:1.1.2.2.4.1 Fri Sep 16 21:49:25 2011
+++ packages/mysql/mysql-control_online_alter_index.patch Sat Nov 19 16:02:15 2011
@@ -7,7 +7,7 @@
# should be done or reviewed by the maintainer!
--- a/sql/handler.h
+++ b/sql/handler.h
-@@ -170,6 +170,19 @@
+@@ -171,6 +171,19 @@
#define HA_ONLINE_DROP_UNIQUE_INDEX (1L << 9) /*drop uniq. online*/
#define HA_ONLINE_ADD_PK_INDEX (1L << 10)/*add prim. online*/
#define HA_ONLINE_DROP_PK_INDEX (1L << 11)/*drop prim. online*/
@@ -29,7 +29,7 @@
supported at all.
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
-@@ -5911,6 +5911,7 @@
+@@ -5914,6 +5914,7 @@
OPT_USERSTAT_RUNNING,
OPT_THREAD_STATISTICS,
OPT_OPTIMIZER_FIX,
@@ -37,7 +37,7 @@
OPT_SUPPRESS_LOG_WARNING_1592,
OPT_QUERY_CACHE_STRIP_COMMENTS,
OPT_USE_GLOBAL_LONG_QUERY_TIME,
-@@ -5943,6 +5944,13 @@
+@@ -5946,6 +5947,13 @@
"from libc.so",
&opt_allow_suspicious_udfs, &opt_allow_suspicious_udfs,
0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -53,7 +53,7 @@
GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
-@@ -758,6 +758,11 @@
+@@ -760,6 +760,11 @@
sys_engine_condition_pushdown(&vars, "engine_condition_pushdown",
&SV::engine_condition_pushdown);
@@ -67,7 +67,7 @@
static sys_var_thd_ulong
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
-@@ -381,6 +381,8 @@
+@@ -383,6 +383,8 @@
my_bool ndb_use_transactions;
my_bool ndb_index_stat_enable;
@@ -94,7 +94,7 @@
DBUG_RETURN(1);
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
-@@ -7005,6 +7005,10 @@
+@@ -7023,6 +7023,10 @@
uint *idx_end_p;
alter_flags= table->file->alter_table_flags(alter_info->flags);
================================================================
Index: packages/mysql/mysql-error_pad.patch
diff -u packages/mysql/mysql-error_pad.patch:1.1.2.2.4.1 packages/mysql/mysql-error_pad.patch:1.1.2.2.4.2
--- packages/mysql/mysql-error_pad.patch:1.1.2.2.4.1 Fri Sep 16 21:49:25 2011
+++ packages/mysql/mysql-error_pad.patch Sat Nov 19 16:02:15 2011
@@ -7,7 +7,7 @@
# should be done or reviewed by the maintainer!
--- a/extra/comp_err.c
+++ b/extra/comp_err.c
-@@ -30,11 +30,12 @@
+@@ -32,11 +32,12 @@
#include <assert.h>
#include <my_dir.h>
@@ -21,7 +21,7 @@
static char *OUTFILE= (char*) "errmsg.sys";
static char *HEADERFILE= (char*) "mysqld_error.h";
static char *NAMEFILE= (char*) "mysqld_ername.h";
-@@ -89,6 +90,7 @@
+@@ -91,6 +92,7 @@
const char *sql_code1; /* sql state */
const char *sql_code2; /* ODBC state */
struct errors *next_error; /* Pointer to next error */
@@ -29,7 +29,7 @@
DYNAMIC_ARRAY msg; /* All language texts for this error */
};
-@@ -127,6 +129,7 @@
+@@ -129,6 +131,7 @@
static struct languages *parse_charset_string(char *str);
@@ -37,7 +37,7 @@
static struct errors *parse_error_string(char *ptr, int er_count);
static struct message *parse_message_string(struct message *new_message,
char *str);
-@@ -229,6 +232,11 @@
+@@ -231,6 +234,11 @@
for (tmp_error= error_head; tmp_error; tmp_error= tmp_error->next_error)
{
@@ -49,7 +49,7 @@
/*
generating mysqld_error.h
fprintf() will automatically add \r on windows
-@@ -318,12 +326,29 @@
+@@ -320,12 +328,29 @@
"language\n", tmp_error->er_name, tmp_lang->lang_short_name);
goto err;
}
@@ -83,7 +83,7 @@
}
/* continue with header of the errmsg.sys file */
-@@ -474,14 +499,26 @@
+@@ -476,14 +501,26 @@
DBUG_RETURN(0);
continue;
}
@@ -115,7 +115,7 @@
/* add error to the list */
*tail_error= current_error;
-@@ -822,78 +859,122 @@
+@@ -824,78 +861,122 @@
DBUG_RETURN(new_message);
}
================================================================
Index: packages/mysql/mysql-i_s_innodb_buffer_pool_pages.patch
diff -u packages/mysql/mysql-i_s_innodb_buffer_pool_pages.patch:1.1.2.3.4.1 packages/mysql/mysql-i_s_innodb_buffer_pool_pages.patch:1.1.2.3.4.2
--- packages/mysql/mysql-i_s_innodb_buffer_pool_pages.patch:1.1.2.3.4.1 Fri Sep 16 21:49:25 2011
+++ packages/mysql/mysql-i_s_innodb_buffer_pool_pages.patch Sat Nov 19 16:02:15 2011
@@ -24,7 +24,7 @@
/********************************************************************//**
--- a/storage/innodb_plugin/handler/ha_innodb.cc
+++ b/storage/innodb_plugin/handler/ha_innodb.cc
-@@ -11252,6 +11252,9 @@
+@@ -11248,6 +11248,9 @@
innobase_system_variables, /* system variables */
NULL /* reserved */
},
@@ -773,7 +773,7 @@
};
--- a/storage/innodb_plugin/include/buf0buf.h
+++ b/storage/innodb_plugin/include/buf0buf.h
-@@ -1286,6 +1286,15 @@
+@@ -1334,6 +1334,15 @@
#define BUF_POOL_ZIP_FOLD_BPAGE(b) BUF_POOL_ZIP_FOLD((buf_block_t*) (b))
/* @} */
================================================================
Index: packages/mysql/mysql-innodb_adjust_defaults.patch
diff -u packages/mysql/mysql-innodb_adjust_defaults.patch:1.1.2.3.4.1 packages/mysql/mysql-innodb_adjust_defaults.patch:1.1.2.3.4.2
--- packages/mysql/mysql-innodb_adjust_defaults.patch:1.1.2.3.4.1 Fri Sep 16 21:49:25 2011
+++ packages/mysql/mysql-innodb_adjust_defaults.patch Sat Nov 19 16:02:15 2011
@@ -7,7 +7,7 @@
# should be done or reviewed by the maintainer!
--- a/storage/innodb_plugin/handler/ha_innodb.cc
+++ b/storage/innodb_plugin/handler/ha_innodb.cc
-@@ -11296,7 +11296,7 @@
+@@ -11290,7 +11290,7 @@
static MYSQL_SYSVAR_ULONG(use_purge_thread, srv_use_purge_thread,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"Number of purge devoted threads. #### over 1 is EXPERIMENTAL ####",
@@ -16,7 +16,7 @@
static MYSQL_SYSVAR_BOOL(overwrite_relay_log_info, innobase_overwrite_relay_log_info,
PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
-@@ -11396,7 +11396,7 @@
+@@ -11390,7 +11390,7 @@
static MYSQL_SYSVAR_BOOL(adaptive_flushing, srv_adaptive_flushing,
PLUGIN_VAR_NOCMDARG,
"Attempt flushing dirty pages to avoid IO bursts at checkpoints.",
@@ -25,7 +25,7 @@
static MYSQL_SYSVAR_ULONG(max_purge_lag, srv_max_purge_lag,
PLUGIN_VAR_RQCMDARG,
-@@ -11629,7 +11629,7 @@
+@@ -11628,7 +11628,7 @@
static MYSQL_SYSVAR_ULONG(ibuf_active_contract, srv_ibuf_active_contract,
PLUGIN_VAR_RQCMDARG,
"Enable/Disable active_contract of insert buffer. 0:disable 1:enable",
@@ -34,7 +34,7 @@
static MYSQL_SYSVAR_ULONG(ibuf_accel_rate, srv_ibuf_accel_rate,
PLUGIN_VAR_RQCMDARG,
-@@ -11709,8 +11709,8 @@
+@@ -11708,8 +11708,8 @@
};
static MYSQL_SYSVAR_ENUM(adaptive_checkpoint, srv_adaptive_checkpoint,
PLUGIN_VAR_RQCMDARG,
================================================================
Index: packages/mysql/mysql-innodb_admin_command_base.patch
diff -u packages/mysql/mysql-innodb_admin_command_base.patch:1.1.2.3.4.1 packages/mysql/mysql-innodb_admin_command_base.patch:1.1.2.3.4.2
--- packages/mysql/mysql-innodb_admin_command_base.patch:1.1.2.3.4.1 Fri Sep 16 21:49:25 2011
+++ packages/mysql/mysql-innodb_admin_command_base.patch Sat Nov 19 16:02:15 2011
@@ -7,18 +7,18 @@
# should be done or reviewed by the maintainer!
--- a/storage/innodb_plugin/handler/ha_innodb.cc
+++ b/storage/innodb_plugin/handler/ha_innodb.cc
-@@ -11608,6 +11608,7 @@
+@@ -11530,6 +11530,7 @@
+ i_s_innodb_cmp_reset,
+ i_s_innodb_cmpmem,
i_s_innodb_cmpmem_reset,
- i_s_innodb_table_stats,
- i_s_innodb_index_stats,
+i_s_innodb_admin_command,
i_s_innodb_patches
mysql_declare_plugin_end;
--- a/storage/innodb_plugin/handler/i_s.cc
+++ b/storage/innodb_plugin/handler/i_s.cc
-@@ -2947,3 +2947,139 @@
- STRUCT_FLD(system_vars, NULL),
+@@ -2602,3 +2602,139 @@
+ /* void* */
STRUCT_FLD(__reserved1, NULL)
};
+
@@ -159,17 +159,17 @@
+};
--- a/storage/innodb_plugin/handler/i_s.h
+++ b/storage/innodb_plugin/handler/i_s.h
-@@ -40,5 +40,6 @@
+@@ -38,5 +38,6 @@
+ extern struct st_mysql_plugin i_s_innodb_cmpmem_reset;
+ extern struct st_mysql_plugin i_s_innodb_patches;
extern struct st_mysql_plugin i_s_innodb_rseg;
- extern struct st_mysql_plugin i_s_innodb_table_stats;
- extern struct st_mysql_plugin i_s_innodb_index_stats;
+extern struct st_mysql_plugin i_s_innodb_admin_command;
#endif /* i_s_h */
--- a/storage/innodb_plugin/handler/innodb_patch_info.h
+++ b/storage/innodb_plugin/handler/innodb_patch_info.h
-@@ -38,5 +38,6 @@
- {"innodb_stats","Additional features about InnoDB statistics/optimizer","","http://www.percona.com/docs/wiki/percona-xtradb"},
+@@ -37,5 +37,6 @@
+ {"innodb_split_buf_pool_mutex","More fix of buffer_pool mutex","Spliting buf_pool_mutex and optimizing based on innodb_opt_lru_count","http://www.percona.com/docs/wiki/percona-xtradb"},
{"innodb_recovery_patches","Bugfixes and adjustments about recovery process","","http://www.percona.com/docs/wiki/percona-xtradb"},
{"innodb_purge_thread","Enable to use purge devoted thread","","http://www.percona.com/docs/wiki/percona-xtradb"},
+{"innodb_admin_command_base","XtraDB specific command interface through i_s","","http://www.percona.com/docs/wiki/percona-xtradb"},
================================================================
Index: packages/mysql/mysql-innodb_buffer_pool_shm.patch
diff -u packages/mysql/mysql-innodb_buffer_pool_shm.patch:1.1.2.3.4.1 packages/mysql/mysql-innodb_buffer_pool_shm.patch:1.1.2.3.4.2
--- packages/mysql/mysql-innodb_buffer_pool_shm.patch:1.1.2.3.4.1 Fri Sep 16 21:49:25 2011
+++ packages/mysql/mysql-innodb_buffer_pool_shm.patch Sat Nov 19 16:02:15 2011
@@ -42,7 +42,7 @@
static char* internal_innobase_data_file_path = NULL;
-@@ -2460,6 +2462,12 @@
+@@ -2472,6 +2474,12 @@
srv_buf_pool_size = (ulint) innobase_buffer_pool_size;
@@ -55,7 +55,7 @@
srv_mem_pool_size = (ulint) innobase_additional_mem_pool_size;
srv_n_file_io_threads = (ulint) innobase_file_io_threads;
-@@ -11472,6 +11480,16 @@
+@@ -11556,6 +11564,16 @@
"The size of the memory buffer InnoDB uses to cache data and indexes of its tables.",
NULL, NULL, 128*1024*1024L, 32*1024*1024L, LONGLONG_MAX, 1024*1024L);
@@ -72,7 +72,7 @@
static MYSQL_SYSVAR_ULONG(commit_concurrency, innobase_commit_concurrency,
PLUGIN_VAR_RQCMDARG,
"Helps in performance tuning in heavily concurrent environments.",
-@@ -11760,6 +11778,8 @@
+@@ -11864,6 +11882,8 @@
MYSQL_SYSVAR(additional_mem_pool_size),
MYSQL_SYSVAR(autoextend_increment),
MYSQL_SYSVAR(buffer_pool_size),
================================================================
Index: packages/mysql/mysql-innodb_deadlock_count.patch
diff -u packages/mysql/mysql-innodb_deadlock_count.patch:1.1.2.4.4.1 packages/mysql/mysql-innodb_deadlock_count.patch:1.1.2.4.4.2
--- packages/mysql/mysql-innodb_deadlock_count.patch:1.1.2.4.4.1 Fri Sep 16 21:49:25 2011
+++ packages/mysql/mysql-innodb_deadlock_count.patch Sat Nov 19 16:02:15 2011
@@ -7,7 +7,7 @@
# should be done or reviewed by the maintainer!
--- a/storage/innodb_plugin/handler/ha_innodb.cc
+++ b/storage/innodb_plugin/handler/ha_innodb.cc
-@@ -566,6 +566,8 @@
+@@ -576,6 +576,8 @@
(char*) &export_vars.innodb_data_written, SHOW_LONG},
{"dblwr_pages_written",
(char*) &export_vars.innodb_dblwr_pages_written, SHOW_LONG},
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/bug53761.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_bug47167_test_fix.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-bug580324.patch?r1=1.1.2.2.4.1&r2=1.1.2.2.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-bugfix48929.patch?r1=1.1.2.2.4.1&r2=1.1.2.2.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-control_online_alter_index.patch?r1=1.1.2.2.4.1&r2=1.1.2.2.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-error_pad.patch?r1=1.1.2.2.4.1&r2=1.1.2.2.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-i_s_innodb_buffer_pool_pages.patch?r1=1.1.2.3.4.1&r2=1.1.2.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_adjust_defaults.patch?r1=1.1.2.3.4.1&r2=1.1.2.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_admin_command_base.patch?r1=1.1.2.3.4.1&r2=1.1.2.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_buffer_pool_shm.patch?r1=1.1.2.3.4.1&r2=1.1.2.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_deadlock_count.patch?r1=1.1.2.4.4.1&r2=1.1.2.4.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_dict_size_limit.patch?r1=1.2.2.3.4.1&r2=1.2.2.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_expand_fast_index_creation.patch?r1=1.1.2.1.4.1&r2=1.1.2.1.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_expand_import.patch?r1=1.1.2.4.4.1&r2=1.1.2.4.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_expand_undo_slots.patch?r1=1.1.2.3.4.1&r2=1.1.2.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_extend_slow.patch?r1=1.2.2.3.4.1&r2=1.2.2.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_extra_rseg.patch?r1=1.2.2.3.4.1&r2=1.2.2.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_fast_checksum.patch?r1=1.1.2.4.4.1&r2=1.1.2.4.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_fast_shutdown.patch?r1=1.1.2.2.4.1&r2=1.1.2.2.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_files_extend.patch?r1=1.1.2.4.4.1&r2=1.1.2.4.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_fix_misc.patch?r1=1.1.2.5.4.1&r2=1.1.2.5.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_io_patches.patch?r1=1.1.4.3.4.1&r2=1.1.4.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_lru_dump_restore.patch?r1=1.1.2.4.4.1&r2=1.1.2.4.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_opt_lru_count.patch?r1=1.1.2.2.4.1&r2=1.1.2.2.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_overwrite_relay_log_info.patch?r1=1.1.2.3.4.1&r2=1.1.2.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_pass_corrupt_table.patch?r1=1.1.2.4.4.1&r2=1.1.2.4.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_purge_thread.patch?r1=1.1.2.3.4.1&r2=1.1.2.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_recovery_patches.patch?r1=1.1.4.3.4.1&r2=1.1.4.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_separate_doublewrite.patch?r1=1.1.2.4.4.1&r2=1.1.2.4.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_show_enhancements.patch?r1=1.1.2.3.4.1&r2=1.1.2.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_show_lock_name.patch?r1=1.1.2.3.4.1&r2=1.1.2.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_show_status.patch?r1=1.1.2.3.4.1&r2=1.1.2.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_show_sys_tables.patch?r1=1.1.2.3.4.1&r2=1.1.2.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_split_buf_pool_mutex.patch?r1=1.3.2.2.4.1&r2=1.3.2.2.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_stats.patch?r1=1.1.2.3.4.1&r2=1.1.2.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_swap_builtin_plugin.patch?r1=1.1.2.4.4.1&r2=1.1.2.4.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_thread_concurrency_timer_based.patch?r1=1.2.2.3.4.1&r2=1.2.2.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-log_connection_error.patch?r1=1.1.2.2.4.1&r2=1.1.2.2.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-mysql-syslog.patch?r1=1.1.2.2.4.1&r2=1.1.2.2.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-mysql_remove_eol_carret.patch?r1=1.1.2.2.4.1&r2=1.1.2.2.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-optimizer_fix.patch?r1=1.1.2.3.4.1&r2=1.1.2.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-profiling_slow.patch?r1=1.2.2.3.4.1&r2=1.2.2.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-query_cache_enhance.patch?r1=1.1.2.3.4.1&r2=1.1.2.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-show_patches.patch?r1=1.1.4.3.4.1&r2=1.1.4.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-show_slave_status_nolock.patch?r1=1.1.2.2.4.1&r2=1.1.2.2.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-show_temp_51.patch?r1=1.1.2.3.4.1&r2=1.1.2.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-slow_extended.patch?r1=1.1.2.3.4.1&r2=1.1.2.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-sql_no_fcache.patch?r1=1.1.2.2.4.1&r2=1.1.2.2.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-suppress_log_warning_1592.patch?r1=1.1.2.3.4.1&r2=1.1.2.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-userstat.patch?r1=1.2.2.3.4.1&r2=1.2.2.3.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.496.2.12.4.1&r2=1.496.2.12.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/response_time_distribution.patch?r1=1.7.2.1&r2=1.7.2.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/utf8_general50_ci.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
More information about the pld-cvs-commit
mailing list