packages (MYSQL_5_1): mysql/mysql-bug580324.patch, mysql/mysql-bugfix48929....
arekm
arekm at pld-linux.org
Mon Jun 13 09:01:41 CEST 2011
Author: arekm Date: Mon Jun 13 07:01:41 2011 GMT
Module: packages Tag: MYSQL_5_1
---- Log message:
- up to 5.1.57
---- Files affected:
packages/mysql:
mysql-bug580324.patch (1.1.2.1 -> 1.1.2.2) , mysql-bugfix48929.patch (1.1.2.1 -> 1.1.2.2) , mysql-control_online_alter_index.patch (1.1.2.1 -> 1.1.2.2) , mysql-fix-bug671764.patch (1.1.2.1 -> 1.1.2.2) , mysql-i_s_innodb_buffer_pool_pages.patch (1.1.2.2 -> 1.1.2.3) , mysql-innodb_adjust_defaults.patch (1.1.2.2 -> 1.1.2.3) , mysql-innodb_admin_command_base.patch (1.1.2.2 -> 1.1.2.3) , mysql-innodb_buffer_pool_shm.patch (1.1.2.2 -> 1.1.2.3) , mysql-innodb_deadlock_count.patch (1.1.2.3 -> 1.1.2.4) , mysql-innodb_dict_size_limit.patch (1.2.2.2 -> 1.2.2.3) , mysql-innodb_expand_import.patch (1.1.2.3 -> 1.1.2.4) , mysql-innodb_expand_undo_slots.patch (1.1.2.2 -> 1.1.2.3) , mysql-innodb_extend_slow.patch (1.2.2.2 -> 1.2.2.3) , mysql-innodb_extra_rseg.patch (1.2.2.2 -> 1.2.2.3) , mysql-innodb_fast_checksum.patch (1.1.2.3 -> 1.1.2.4) , mysql-innodb_fast_shutdown.patch (1.1.2.1 -> 1.1.2.2) , mysql-innodb_files_extend.patch (1.1.2.3 -> 1.1.2.4) , mysql-innodb_fix_misc.patch (1.1.2.4 -> 1.1.2.5) , mysql-innodb_io_patches.patch (1.1.4.2 -> 1.1.4.3) , mysql-innodb_lru_dump_restore.patch (1.1.2.3 -> 1.1.2.4) , mysql-innodb_opt_lru_count.patch (1.1.2.1 -> 1.1.2.2) , mysql-innodb_overwrite_relay_log_info.patch (1.1.2.2 -> 1.1.2.3) , mysql-innodb_pass_corrupt_table.patch (1.1.2.3 -> 1.1.2.4) , mysql-innodb_purge_thread.patch (1.1.2.2 -> 1.1.2.3) , mysql-innodb_recovery_patches.patch (1.1.4.2 -> 1.1.4.3) , mysql-innodb_separate_doublewrite.patch (1.1.2.3 -> 1.1.2.4) , mysql-innodb_show_enhancements.patch (1.1.2.2 -> 1.1.2.3) , mysql-innodb_show_lock_name.patch (1.1.2.2 -> 1.1.2.3) , mysql-innodb_show_status.patch (1.1.2.2 -> 1.1.2.3) , mysql-innodb_show_sys_tables.patch (1.1.2.2 -> 1.1.2.3) , mysql-innodb_split_buf_pool_mutex.patch (1.3.2.1 -> 1.3.2.2) , mysql-innodb_stats.patch (1.1.2.2 -> 1.1.2.3) , mysql-innodb_swap_builtin_plugin.patch (1.1.2.3 -> 1.1.2.4) , mysql-innodb_thread_concurrency_timer_based.patch (1.2.2.2 -> 1.2.2.3) , mysql-log_connection_error.patch (1.1.2.1 -> 1.1.2.2) , mysql-microsec_process.patch (1.3.2.1 -> 1.3.2.2) , mysql-mysql-syslog.patch (1.1.2.1 -> 1.1.2.2) , mysql-mysql_remove_eol_carret.patch (1.1.2.1 -> 1.1.2.2) , mysql-optimizer_fix.patch (1.1.2.2 -> 1.1.2.3) , mysql-profiling_slow.patch (1.2.2.2 -> 1.2.2.3) , mysql-query_cache_enhance.patch (1.1.2.2 -> 1.1.2.3) , mysql-response-time-distribution.patch (1.1.2.1 -> 1.1.2.2) , mysql-show_patches.patch (1.1.4.2 -> 1.1.4.3) , mysql-show_slave_status_nolock.patch (1.1.2.1 -> 1.1.2.2) , mysql-show_temp_51.patch (1.1.2.2 -> 1.1.2.3) , mysql-slow_extended.patch (1.1.2.2 -> 1.1.2.3) , mysql-sql_no_fcache.patch (1.1.2.1 -> 1.1.2.2) , mysql-suppress_log_warning_1592.patch (1.1.2.2 -> 1.1.2.3) , mysql-userstat.patch (1.2.2.2 -> 1.2.2.3) , mysql.spec (1.496.2.11 -> 1.496.2.12) , mysql_dump_ignore_ct.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: packages/mysql/mysql-bug580324.patch
diff -u packages/mysql/mysql-bug580324.patch:1.1.2.1 packages/mysql/mysql-bug580324.patch:1.1.2.2
--- packages/mysql/mysql-bug580324.patch:1.1.2.1 Fri Dec 17 12:41:48 2010
+++ packages/mysql/mysql-bug580324.patch Mon Jun 13 09:01:31 2011
@@ -26,7 +26,7 @@
diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
--- a/sql/sql_parse.cc 2010-05-27 19:54:18.000000000 +0400
+++ b/sql/sql_parse.cc 2010-05-27 20:03:20.000000000 +0400
-@@ -1327,10 +1327,12 @@
+@@ -1341,10 +1341,12 @@
break;
#else
{
@@ -41,7 +41,7 @@
/* used as fields initializator */
lex_start(thd);
-@@ -1342,26 +1344,22 @@
+@@ -1356,26 +1358,22 @@
/*
We have name + wildcard in packet, separated by endzero
*/
@@ -79,7 +79,7 @@
if (is_schema_db(table_list.db, table_list.db_length))
{
-@@ -1370,9 +1368,6 @@
+@@ -1384,9 +1382,6 @@
table_list.schema_table= schema_table;
}
================================================================
Index: packages/mysql/mysql-bugfix48929.patch
diff -u packages/mysql/mysql-bugfix48929.patch:1.1.2.1 packages/mysql/mysql-bugfix48929.patch:1.1.2.2
--- packages/mysql/mysql-bugfix48929.patch:1.1.2.1 Tue Mar 8 09:52:41 2011
+++ packages/mysql/mysql-bugfix48929.patch Mon Jun 13 09:01:31 2011
@@ -45,7 +45,7 @@
#define mysqld_charset &my_charset_latin1
#ifdef HAVE_purify
-@@ -5100,28 +5104,49 @@
+@@ -5124,28 +5128,49 @@
{
my_socket sock,new_sock;
uint error_count=0;
@@ -98,7 +98,7 @@
#ifdef HAVE_FCNTL
socket_flags=fcntl(unix_sock, F_GETFL, 0);
#endif
-@@ -5131,12 +5156,15 @@
+@@ -5155,12 +5180,15 @@
MAYBE_BROKEN_SYSCALL;
while (!abort_loop)
{
@@ -119,7 +119,7 @@
{
if (socket_errno != SOCKET_EINTR)
{
-@@ -5146,7 +5174,7 @@
+@@ -5170,7 +5198,7 @@
MAYBE_BROKEN_SYSCALL
continue;
}
@@ -128,7 +128,7 @@
if (abort_loop)
{
MAYBE_BROKEN_SYSCALL;
-@@ -5154,6 +5182,21 @@
+@@ -5178,6 +5206,21 @@
}
/* Is this a new connection request ? */
@@ -150,7 +150,7 @@
#ifdef HAVE_SYS_UN_H
if (FD_ISSET(unix_sock,&readFDs))
{
-@@ -5161,11 +5204,12 @@
+@@ -5185,11 +5228,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.1 packages/mysql/mysql-control_online_alter_index.patch:1.1.2.2
--- packages/mysql/mysql-control_online_alter_index.patch:1.1.2.1 Tue Mar 8 09:52:41 2011
+++ packages/mysql/mysql-control_online_alter_index.patch Mon Jun 13 09:01:31 2011
@@ -8,7 +8,7 @@
diff -ruN a/sql/handler.h b/sql/handler.h
--- a/sql/handler.h 2010-07-21 22:49:53.660561079 +0900
+++ b/sql/handler.h 2010-07-21 22:50:24.106530090 +0900
-@@ -170,6 +170,19 @@
+@@ -169,6 +169,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*/
@@ -31,7 +31,7 @@
diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc 2010-07-21 22:49:54.011529414 +0900
+++ b/sql/mysqld.cc 2010-07-21 22:50:24.112527179 +0900
-@@ -5874,6 +5874,7 @@
+@@ -5898,6 +5898,7 @@
OPT_USERSTAT_RUNNING,
OPT_THREAD_STATISTICS,
OPT_OPTIMIZER_FIX,
@@ -39,7 +39,7 @@
OPT_SUPPRESS_LOG_WARNING_1592,
OPT_QUERY_CACHE_STRIP_COMMENTS,
OPT_USE_GLOBAL_LONG_QUERY_TIME,
-@@ -5905,6 +5906,13 @@
+@@ -5930,6 +5931,13 @@
"from libc.so",
&opt_allow_suspicious_udfs, &opt_allow_suspicious_udfs,
0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -56,7 +56,7 @@
diff -ruN a/sql/set_var.cc b/sql/set_var.cc
--- a/sql/set_var.cc 2010-07-21 22:49:54.019529438 +0900
+++ b/sql/set_var.cc 2010-07-21 22:50:24.122532110 +0900
-@@ -748,6 +748,11 @@
+@@ -758,6 +758,11 @@
sys_engine_condition_pushdown(&vars, "engine_condition_pushdown",
&SV::engine_condition_pushdown);
@@ -83,7 +83,7 @@
diff -ruN a/sql/sql_partition.cc b/sql/sql_partition.cc
--- a/sql/sql_partition.cc 2010-06-04 00:50:11.000000000 +0900
+++ b/sql/sql_partition.cc 2010-07-21 22:50:24.140530183 +0900
-@@ -4359,7 +4359,12 @@
+@@ -4381,7 +4381,12 @@
alter_info->no_parts= curr_part_no - new_part_no;
}
}
@@ -100,7 +100,7 @@
diff -ruN a/sql/sql_table.cc b/sql/sql_table.cc
--- a/sql/sql_table.cc 2010-06-04 00:50:11.000000000 +0900
+++ b/sql/sql_table.cc 2010-07-21 22:50:24.146531063 +0900
-@@ -6993,6 +6993,10 @@
+@@ -7003,6 +7003,10 @@
uint *idx_end_p;
alter_flags= table->file->alter_table_flags(alter_info->flags);
================================================================
Index: packages/mysql/mysql-fix-bug671764.patch
diff -u packages/mysql/mysql-fix-bug671764.patch:1.1.2.1 packages/mysql/mysql-fix-bug671764.patch:1.1.2.2
--- packages/mysql/mysql-fix-bug671764.patch:1.1.2.1 Tue Mar 8 09:52:41 2011
+++ packages/mysql/mysql-fix-bug671764.patch Mon Jun 13 09:01:31 2011
@@ -5,10 +5,10 @@
#!!! notice !!!
# Any small change to this file in the main branch
# should be done or reviewed by the maintainer!
-diff -Nur a/configure.in b/configure.in
+diff -ruN a/configure.in b/configure.in
--- a/configure.in 2010-11-29 18:45:47.000000000 +0000
+++ b/configure.in 2010-11-29 18:45:51.000000000 +0000
-@@ -2718,7 +2718,7 @@
+@@ -2727,7 +2727,7 @@
MAN_DROP="$MAN_DROP embedded"
grep -v 'embedded' $MANLISTFIL > $TMPLISTFIL ; mv -f $TMPLISTFIL $MANLISTFIL
fi
@@ -17,12 +17,12 @@
then
MAN_DROP="$MAN_DROP innodb"
grep -v 'inno' $MANLISTFIL > $TMPLISTFIL ; mv -f $TMPLISTFIL $MANLISTFIL
-@@ -2797,7 +2797,7 @@
+@@ -2806,7 +2806,7 @@
fi
-
+
# "innochecksum" is not in the "innobase/" subdirectory, but should be switched
-AM_CONDITIONAL([BUILD_INNODB_TOOLS], [test X"$with_plugin_innobase" = Xyes])
+AM_CONDITIONAL([BUILD_INNODB_TOOLS], [test X"$with_plugin_innodb_plugin" = Xyes])
-
+
# IMPORTANT - do not modify LIBS past this line - this hack is the only way
# I know to add the static NSS magic if we have static NSS libraries with
================================================================
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.2 packages/mysql/mysql-i_s_innodb_buffer_pool_pages.patch:1.1.2.3
--- packages/mysql/mysql-i_s_innodb_buffer_pool_pages.patch:1.1.2.2 Sat Feb 19 23:35:53 2011
+++ packages/mysql/mysql-i_s_innodb_buffer_pool_pages.patch Mon Jun 13 09:01:31 2011
@@ -26,7 +26,7 @@
diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
--- a/storage/innodb_plugin/handler/ha_innodb.cc 2010-04-29 15:55:25.000000000 +0900
+++ b/storage/innodb_plugin/handler/ha_innodb.cc 2010-04-29 16:04:05.000000000 +0900
-@@ -11175,6 +11175,9 @@
+@@ -11256,6 +11256,9 @@
innobase_system_variables, /* system variables */
NULL /* reserved */
},
@@ -618,7 +618,7 @@
+
+ /* plugin author (for SHOW PLUGINS) */
+ /* const char* */
-+ STRUCT_FLD(author, plugin_author),
++ STRUCT_FLD(author, "Percona"),
+
+ /* general descriptive text (for SHOW PLUGINS) */
+ /* const char* */
@@ -667,7 +667,7 @@
+
+ /* plugin author (for SHOW PLUGINS) */
+ /* const char* */
-+ STRUCT_FLD(author, plugin_author),
++ STRUCT_FLD(author, "Percona"),
+
+ /* general descriptive text (for SHOW PLUGINS) */
+ /* const char* */
@@ -716,7 +716,7 @@
+
+ /* plugin author (for SHOW PLUGINS) */
+ /* const char* */
-+ STRUCT_FLD(author, plugin_author),
++ STRUCT_FLD(author, "Percona"),
+
+ /* general descriptive text (for SHOW PLUGINS) */
+ /* const char* */
================================================================
Index: packages/mysql/mysql-innodb_adjust_defaults.patch
diff -u packages/mysql/mysql-innodb_adjust_defaults.patch:1.1.2.2 packages/mysql/mysql-innodb_adjust_defaults.patch:1.1.2.3
--- packages/mysql/mysql-innodb_adjust_defaults.patch:1.1.2.2 Sat Feb 19 23:35:53 2011
+++ packages/mysql/mysql-innodb_adjust_defaults.patch Mon Jun 13 09:01:31 2011
@@ -8,16 +8,16 @@
diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
--- a/storage/innodb_plugin/handler/ha_innodb.cc 2010-04-30 16:39:14.000000000 +0900
+++ b/storage/innodb_plugin/handler/ha_innodb.cc 2010-04-30 16:43:26.000000000 +0900
-@@ -11223,7 +11223,7 @@
+@@ -11300,7 +11300,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 ####",
-- NULL, NULL, 0, 0, 64, 0);
-+ NULL, NULL, 1, 0, 64, 0);
+- NULL, NULL, 0, 0, UNIV_MAX_PARALLELISM, 0);
++ NULL, NULL, 1, 0, UNIV_MAX_PARALLELISM, 0);
static MYSQL_SYSVAR_BOOL(overwrite_relay_log_info, innobase_overwrite_relay_log_info,
PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
-@@ -11323,7 +11323,7 @@
+@@ -11400,7 +11400,7 @@
static MYSQL_SYSVAR_BOOL(adaptive_flushing, srv_adaptive_flushing,
PLUGIN_VAR_NOCMDARG,
"Attempt flushing dirty pages to avoid IO bursts at checkpoints.",
@@ -26,7 +26,7 @@
static MYSQL_SYSVAR_ULONG(max_purge_lag, srv_max_purge_lag,
PLUGIN_VAR_RQCMDARG,
-@@ -11568,7 +11568,7 @@
+@@ -11633,7 +11633,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",
@@ -35,7 +35,7 @@
static MYSQL_SYSVAR_ULONG(ibuf_accel_rate, srv_ibuf_accel_rate,
PLUGIN_VAR_RQCMDARG,
-@@ -11648,8 +11648,8 @@
+@@ -11713,8 +11713,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.2 packages/mysql/mysql-innodb_admin_command_base.patch:1.1.2.3
--- packages/mysql/mysql-innodb_admin_command_base.patch:1.1.2.2 Sat Feb 19 23:35:53 2011
+++ packages/mysql/mysql-innodb_admin_command_base.patch Mon Jun 13 09:01:31 2011
@@ -8,7 +8,7 @@
diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
--- a/storage/innodb_plugin/handler/ha_innodb.cc 2010-08-27 16:27:30.222410116 +0900
+++ b/storage/innodb_plugin/handler/ha_innodb.cc 2010-08-27 16:27:44.073104773 +0900
-@@ -11547,6 +11547,7 @@
+@@ -11612,6 +11612,7 @@
i_s_innodb_cmpmem_reset,
i_s_innodb_table_stats,
i_s_innodb_index_stats,
@@ -149,7 +149,7 @@
+ STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
+ STRUCT_FLD(info, &i_s_info),
+ STRUCT_FLD(name, "XTRADB_ADMIN_COMMAND"),
-+ STRUCT_FLD(author, plugin_author),
++ STRUCT_FLD(author, "Percona"),
+ STRUCT_FLD(descr, "XtraDB specific command acceptor"),
+ STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
+ STRUCT_FLD(init, i_s_innodb_admin_command_init),
================================================================
Index: packages/mysql/mysql-innodb_buffer_pool_shm.patch
diff -u packages/mysql/mysql-innodb_buffer_pool_shm.patch:1.1.2.2 packages/mysql/mysql-innodb_buffer_pool_shm.patch:1.1.2.3
--- packages/mysql/mysql-innodb_buffer_pool_shm.patch:1.1.2.2 Sat Mar 12 15:52:45 2011
+++ packages/mysql/mysql-innodb_buffer_pool_shm.patch Mon Jun 13 09:01:31 2011
@@ -681,7 +681,7 @@
static char* internal_innobase_data_file_path = NULL;
-@@ -2457,6 +2458,7 @@
+@@ -2476,6 +2477,7 @@
srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
srv_use_checksums = (ibool) innobase_use_checksums;
srv_fast_checksum = (ibool) innobase_fast_checksum;
@@ -689,7 +689,7 @@
#ifdef HAVE_LARGE_PAGES
if ((os_use_large_pages = (ibool) my_use_large_pages))
-@@ -11418,6 +11420,16 @@
+@@ -11476,6 +11478,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);
@@ -706,7 +706,7 @@
static MYSQL_SYSVAR_ULONG(commit_concurrency, innobase_commit_concurrency,
PLUGIN_VAR_RQCMDARG,
"Helps in performance tuning in heavily concurrent environments.",
-@@ -11699,6 +11711,8 @@
+@@ -11764,6 +11776,8 @@
MYSQL_SYSVAR(additional_mem_pool_size),
MYSQL_SYSVAR(autoextend_increment),
MYSQL_SYSVAR(buffer_pool_size),
@@ -1131,7 +1131,7 @@
diff -ruN a/storage/innodb_plugin/srv/srv0start.c b/storage/innodb_plugin/srv/srv0start.c
--- a/storage/innodb_plugin/srv/srv0start.c 2010-07-14 16:33:23.851391514 +0900
+++ b/storage/innodb_plugin/srv/srv0start.c 2010-07-14 16:40:16.180321173 +0900
-@@ -1744,6 +1744,8 @@
+@@ -1750,6 +1750,8 @@
Note that this is not as heavy weight as it seems. At
this point there will be only ONE page in the buf_LRU
and there must be no page in the buf_flush list. */
================================================================
Index: packages/mysql/mysql-innodb_deadlock_count.patch
diff -u packages/mysql/mysql-innodb_deadlock_count.patch:1.1.2.3 packages/mysql/mysql-innodb_deadlock_count.patch:1.1.2.4
--- packages/mysql/mysql-innodb_deadlock_count.patch:1.1.2.3 Tue Mar 8 09:52:41 2011
+++ packages/mysql/mysql-innodb_deadlock_count.patch Mon Jun 13 09:01:31 2011
@@ -8,7 +8,7 @@
diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
--- a/storage/innodb_plugin/handler/ha_innodb.cc 2010-08-10 15:32:14.468241191 +0400
+++ b/storage/innodb_plugin/handler/ha_innodb.cc 2010-08-10 15:32:14.926992081 +0400
-@@ -547,6 +547,8 @@
+@@ -566,6 +566,8 @@
(char*) &export_vars.innodb_data_written, SHOW_LONG},
{"dblwr_pages_written",
(char*) &export_vars.innodb_dblwr_pages_written, SHOW_LONG},
@@ -31,7 +31,7 @@
diff -ruN a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
--- a/storage/innodb_plugin/include/srv0srv.h 2010-08-10 15:32:14.478241628 +0400
+++ b/storage/innodb_plugin/include/srv0srv.h 2010-08-10 15:32:14.936991959 +0400
-@@ -675,6 +675,7 @@
+@@ -689,6 +689,7 @@
ulint innodb_buffer_pool_write_requests;/*!< srv_buf_pool_write_requests */
ulint innodb_buffer_pool_read_ahead; /*!< srv_read_ahead */
ulint innodb_buffer_pool_read_ahead_evicted;/*!< srv_read_ahead evicted*/
@@ -53,7 +53,7 @@
diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
--- a/storage/innodb_plugin/srv/srv0srv.c 2010-08-10 15:32:14.478241628 +0400
+++ b/storage/innodb_plugin/srv/srv0srv.c 2010-08-10 15:32:14.936991959 +0400
-@@ -440,7 +440,7 @@
+@@ -444,7 +444,7 @@
static ulint srv_n_rows_updated_old = 0;
static ulint srv_n_rows_deleted_old = 0;
static ulint srv_n_rows_read_old = 0;
@@ -62,7 +62,7 @@
UNIV_INTERN ulint srv_n_lock_wait_count = 0;
UNIV_INTERN ulint srv_n_lock_wait_current_count = 0;
UNIV_INTERN ib_int64_t srv_n_lock_wait_time = 0;
-@@ -2151,6 +2151,8 @@
+@@ -2155,6 +2155,8 @@
= UT_LIST_GET_LEN(buf_pool->flush_list);
export_vars.innodb_buffer_pool_pages_free
= UT_LIST_GET_LEN(buf_pool->free);
================================================================
Index: packages/mysql/mysql-innodb_dict_size_limit.patch
diff -u packages/mysql/mysql-innodb_dict_size_limit.patch:1.2.2.2 packages/mysql/mysql-innodb_dict_size_limit.patch:1.2.2.3
--- packages/mysql/mysql-innodb_dict_size_limit.patch:1.2.2.2 Sat Feb 19 23:35:53 2011
+++ packages/mysql/mysql-innodb_dict_size_limit.patch Mon Jun 13 09:01:31 2011
@@ -328,7 +328,7 @@
/****************************************************************//**
If the given column name is reserved for InnoDB system columns, return
TRUE.
-@@ -1703,6 +1765,11 @@
+@@ -1709,6 +1771,11 @@
ut_ad(index->magic_n == DICT_INDEX_MAGIC_N);
ut_ad(mutex_own(&(dict_sys->mutex)));
@@ -343,7 +343,7 @@
diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
--- a/storage/innodb_plugin/handler/ha_innodb.cc 2010-08-27 16:09:22.832057795 +0900
+++ b/storage/innodb_plugin/handler/ha_innodb.cc 2010-08-27 16:09:42.939059876 +0900
-@@ -541,6 +541,8 @@
+@@ -560,6 +560,8 @@
(char*) &export_vars.innodb_dblwr_pages_written, SHOW_LONG},
{"dblwr_writes",
(char*) &export_vars.innodb_dblwr_writes, SHOW_LONG},
@@ -352,7 +352,7 @@
{"have_atomic_builtins",
(char*) &export_vars.innodb_have_atomic_builtins, SHOW_BOOL},
{"log_waits",
-@@ -11310,6 +11312,11 @@
+@@ -11390,6 +11392,11 @@
"Number of extra user rollback segments when create new database.",
NULL, NULL, 0, 0, 126, 0);
@@ -364,7 +364,7 @@
static struct st_mysql_sys_var* innobase_system_variables[]= {
MYSQL_SYSVAR(additional_mem_pool_size),
MYSQL_SYSVAR(autoextend_increment),
-@@ -11377,6 +11384,7 @@
+@@ -11458,6 +11465,7 @@
MYSQL_SYSVAR(flush_log_at_trx_commit_session),
MYSQL_SYSVAR(enable_unsafe_group_commit),
MYSQL_SYSVAR(extra_rsegments),
@@ -459,7 +459,7 @@
diff -ruN a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
--- a/storage/innodb_plugin/include/srv0srv.h 2010-08-27 16:09:22.833022367 +0900
+++ b/storage/innodb_plugin/include/srv0srv.h 2010-08-27 16:09:42.957104575 +0900
-@@ -214,7 +214,7 @@
+@@ -219,7 +219,7 @@
extern ulint srv_adaptive_checkpoint;
extern ulint srv_extra_rsegments;
@@ -468,7 +468,7 @@
/*-------------------------------------------*/
extern ulint srv_n_rows_inserted;
-@@ -607,6 +607,7 @@
+@@ -625,6 +625,7 @@
ulint innodb_data_writes; /*!< I/O write requests */
ulint innodb_data_written; /*!< Data bytes written */
ulint innodb_data_reads; /*!< I/O read requests */
@@ -479,7 +479,7 @@
diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
--- a/storage/innodb_plugin/srv/srv0srv.c 2010-08-27 16:09:22.834056830 +0900
+++ b/storage/innodb_plugin/srv/srv0srv.c 2010-08-27 16:09:42.960059093 +0900
-@@ -386,6 +386,7 @@
+@@ -391,6 +391,7 @@
UNIV_INTERN ulint srv_adaptive_checkpoint = 0; /* 0: none 1: reflex 2: estimate */
UNIV_INTERN ulint srv_extra_rsegments = 0; /* extra rseg for users */
@@ -487,7 +487,7 @@
/*-------------------------------------------*/
UNIV_INTERN ulong srv_n_spin_wait_rounds = 30;
UNIV_INTERN ulong srv_n_free_tickets_to_enter = 500;
-@@ -2086,6 +2087,7 @@
+@@ -2091,6 +2092,7 @@
export_vars.innodb_data_reads = os_n_file_reads;
export_vars.innodb_data_writes = os_n_file_writes;
export_vars.innodb_data_written = srv_data_written;
================================================================
Index: packages/mysql/mysql-innodb_expand_import.patch
diff -u packages/mysql/mysql-innodb_expand_import.patch:1.1.2.3 packages/mysql/mysql-innodb_expand_import.patch:1.1.2.4
--- packages/mysql/mysql-innodb_expand_import.patch:1.1.2.3 Sat Mar 12 15:52:45 2011
+++ packages/mysql/mysql-innodb_expand_import.patch Mon Jun 13 09:01:31 2011
@@ -104,7 +104,7 @@
+
+ if (size_bytes < free_limit_bytes) {
+ free_limit_bytes = size_bytes;
-+ if (size_bytes >= FSP_EXTENT_SIZE * UNIV_PAGE_SIZE) {
++ if (size_bytes >= (ib_int64_t) (FSP_EXTENT_SIZE * UNIV_PAGE_SIZE)) {
+ fprintf(stderr, "InnoDB: free limit of %s is larger than its real size.\n", filepath);
+ file_is_corrupt = TRUE;
+ }
@@ -500,7 +500,7 @@
diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
--- a/storage/innodb_plugin/handler/ha_innodb.cc 2010-04-29 16:54:08.000000000 +0900
+++ b/storage/innodb_plugin/handler/ha_innodb.cc 2010-04-30 10:28:05.000000000 +0900
-@@ -7106,6 +7106,14 @@
+@@ -7125,6 +7125,14 @@
err = row_discard_tablespace_for_mysql(dict_table->name, trx);
} else {
err = row_import_tablespace_for_mysql(dict_table->name, trx);
@@ -515,7 +515,7 @@
}
err = convert_error_code_to_mysql(err, dict_table->flags, NULL);
-@@ -11307,6 +11315,11 @@
+@@ -11387,6 +11395,11 @@
"Enable/Disable unsafe group commit when support_xa=OFF and use with binlog or other XA storage engine.",
NULL, NULL, 0, 0, 1, 0);
@@ -527,7 +527,7 @@
static MYSQL_SYSVAR_ULONG(extra_rsegments, srv_extra_rsegments,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"Number of extra user rollback segments when create new database.",
-@@ -11383,6 +11396,7 @@
+@@ -11464,6 +11477,7 @@
MYSQL_SYSVAR(adaptive_checkpoint),
MYSQL_SYSVAR(flush_log_at_trx_commit_session),
MYSQL_SYSVAR(enable_unsafe_group_commit),
@@ -549,7 +549,7 @@
diff -ruN a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
--- a/storage/innodb_plugin/include/srv0srv.h 2010-04-29 16:54:08.000000000 +0900
+++ b/storage/innodb_plugin/include/srv0srv.h 2010-04-30 10:28:05.000000000 +0900
-@@ -213,6 +213,8 @@
+@@ -218,6 +218,8 @@
extern ulint srv_read_ahead;
extern ulint srv_adaptive_checkpoint;
@@ -561,7 +561,7 @@
diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
--- a/storage/innodb_plugin/srv/srv0srv.c 2010-04-29 18:58:20.000000000 +0900
+++ b/storage/innodb_plugin/srv/srv0srv.c 2010-04-30 10:28:05.000000000 +0900
-@@ -385,6 +385,8 @@
+@@ -390,6 +390,8 @@
UNIV_INTERN ulint srv_read_ahead = 3; /* 1: random 2: linear 3: Both */
UNIV_INTERN ulint srv_adaptive_checkpoint = 0; /* 0: none 1: reflex 2: estimate */
================================================================
Index: packages/mysql/mysql-innodb_expand_undo_slots.patch
diff -u packages/mysql/mysql-innodb_expand_undo_slots.patch:1.1.2.2 packages/mysql/mysql-innodb_expand_undo_slots.patch:1.1.2.3
--- packages/mysql/mysql-innodb_expand_undo_slots.patch:1.1.2.2 Sat Feb 19 23:35:53 2011
+++ packages/mysql/mysql-innodb_expand_undo_slots.patch Mon Jun 13 09:01:31 2011
@@ -16,7 +16,7 @@
static my_bool innobase_locks_unsafe_for_binlog = FALSE;
static my_bool innobase_rollback_on_timeout = FALSE;
static my_bool innobase_create_status_file = FALSE;
-@@ -2103,6 +2104,8 @@
+@@ -2122,6 +2123,8 @@
goto error;
}
@@ -25,7 +25,7 @@
/* -------------- Log files ---------------------------*/
/* The default dir for log files is the datadir of MySQL */
-@@ -10712,6 +10715,13 @@
+@@ -10785,6 +10788,13 @@
"The common part for InnoDB table spaces.",
NULL, NULL, NULL);
@@ -39,7 +39,7 @@
static MYSQL_SYSVAR_BOOL(doublewrite, innobase_use_doublewrite,
PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
"Enable InnoDB doublewrite buffer (enabled by default). "
-@@ -11097,6 +11107,7 @@
+@@ -11177,6 +11187,7 @@
MYSQL_SYSVAR(data_file_path),
MYSQL_SYSVAR(data_home_dir),
MYSQL_SYSVAR(doublewrite),
================================================================
Index: packages/mysql/mysql-innodb_extend_slow.patch
diff -u packages/mysql/mysql-innodb_extend_slow.patch:1.2.2.2 packages/mysql/mysql-innodb_extend_slow.patch:1.2.2.3
--- packages/mysql/mysql-innodb_extend_slow.patch:1.2.2.2 Sat Mar 12 15:52:45 2011
+++ packages/mysql/mysql-innodb_extend_slow.patch Mon Jun 13 09:01:31 2011
@@ -49,7 +49,7 @@
/*
IMPLEMENTATION OF THE BUFFER POOL
-@@ -1726,10 +1760,18 @@
+@@ -1728,10 +1762,18 @@
mutex_t* block_mutex;
ibool must_read;
unsigned access_time;
@@ -68,7 +68,7 @@
buf_pool->stat.n_page_gets++;
for (;;) {
-@@ -1746,7 +1788,7 @@
+@@ -1748,7 +1790,7 @@
//buf_pool_mutex_exit();
rw_lock_s_unlock(&page_hash_latch);
@@ -77,7 +77,7 @@
#if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG
ut_a(++buf_dbg_counter % 37 || buf_validate());
-@@ -1822,6 +1864,13 @@
+@@ -1823,6 +1865,13 @@
/* Let us wait until the read operation
completes */
@@ -91,7 +91,7 @@
for (;;) {
enum buf_io_fix io_fix;
-@@ -1836,6 +1885,12 @@
+@@ -1837,6 +1886,12 @@
break;
}
}
@@ -104,7 +104,7 @@
}
#ifdef UNIV_IBUF_COUNT_DEBUG
-@@ -2092,6 +2147,11 @@
+@@ -2096,6 +2151,11 @@
ibool must_read;
ulint retries = 0;
mutex_t* block_mutex;
@@ -116,7 +116,7 @@
ut_ad(mtr);
ut_ad(mtr->state == MTR_ACTIVE);
-@@ -2106,6 +2166,9 @@
+@@ -2120,6 +2180,9 @@
#ifndef UNIV_LOG_DEBUG
ut_ad(!ibuf_inside() || ibuf_page(space, zip_size, offset, NULL));
#endif
@@ -126,7 +126,7 @@
buf_pool->stat.n_page_gets++;
loop:
block = guess;
-@@ -2159,7 +2222,7 @@
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-bug580324.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-bugfix48929.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-control_online_alter_index.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-fix-bug671764.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-i_s_innodb_buffer_pool_pages.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_adjust_defaults.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_admin_command_base.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_buffer_pool_shm.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_deadlock_count.patch?r1=1.1.2.3&r2=1.1.2.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_dict_size_limit.patch?r1=1.2.2.2&r2=1.2.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_expand_import.patch?r1=1.1.2.3&r2=1.1.2.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_expand_undo_slots.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_extend_slow.patch?r1=1.2.2.2&r2=1.2.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_extra_rseg.patch?r1=1.2.2.2&r2=1.2.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_fast_checksum.patch?r1=1.1.2.3&r2=1.1.2.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_fast_shutdown.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-innodb_files_extend.patch?r1=1.1.2.3&r2=1.1.2.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_fix_misc.patch?r1=1.1.2.4&r2=1.1.2.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_io_patches.patch?r1=1.1.4.2&r2=1.1.4.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_lru_dump_restore.patch?r1=1.1.2.3&r2=1.1.2.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_opt_lru_count.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-innodb_overwrite_relay_log_info.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_pass_corrupt_table.patch?r1=1.1.2.3&r2=1.1.2.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_purge_thread.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_recovery_patches.patch?r1=1.1.4.2&r2=1.1.4.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_separate_doublewrite.patch?r1=1.1.2.3&r2=1.1.2.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_show_enhancements.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_show_lock_name.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_show_status.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_show_sys_tables.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_split_buf_pool_mutex.patch?r1=1.3.2.1&r2=1.3.2.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_stats.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_swap_builtin_plugin.patch?r1=1.1.2.3&r2=1.1.2.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_thread_concurrency_timer_based.patch?r1=1.2.2.2&r2=1.2.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-log_connection_error.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-microsec_process.patch?r1=1.3.2.1&r2=1.3.2.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-mysql-syslog.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-mysql_remove_eol_carret.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-optimizer_fix.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-profiling_slow.patch?r1=1.2.2.2&r2=1.2.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-query_cache_enhance.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-response-time-distribution.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-show_patches.patch?r1=1.1.4.2&r2=1.1.4.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-show_slave_status_nolock.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-show_temp_51.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-slow_extended.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-sql_no_fcache.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-suppress_log_warning_1592.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-userstat.patch?r1=1.2.2.2&r2=1.2.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.496.2.11&r2=1.496.2.12&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql_dump_ignore_ct.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list