packages: mysql/bug860910.patch, mysql/control_online_alter_index.patch, my...
arekm
arekm at pld-linux.org
Thu Feb 16 17:26:20 CET 2012
Author: arekm Date: Thu Feb 16 16:26:20 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 5.5.20
---- Files affected:
packages/mysql:
bug860910.patch (1.4 -> 1.5) , control_online_alter_index.patch (1.7 -> 1.8) , group_commit.patch (1.3 -> 1.4) , innodb_adaptive_hash_index_partitions.patch (1.12 -> 1.13) , innodb_admin_command_base.patch (1.10 -> 1.11) , innodb_buffer_pool_pages_i_s.patch (1.11 -> 1.12) , innodb_buffer_pool_shm.patch (1.11 -> 1.12) , innodb_deadlock_count.patch (1.9 -> 1.10) , innodb_dict_size_limit.patch (1.9 -> 1.10) , innodb_expand_fast_index_creation.patch (1.6 -> 1.7) , innodb_expand_import.patch (1.10 -> 1.11) , innodb_extend_slow.patch (1.11 -> 1.12) , innodb_extra_rseg.patch (1.9 -> 1.10) , innodb_fake_changes.patch (1.4 -> 1.5) , innodb_fast_checksum.patch (1.10 -> 1.11) , innodb_files_extend.patch (1.10 -> 1.11) , innodb_fix_misc.patch (1.12 -> 1.13) , innodb_io_patches.patch (1.10 -> 1.11) , innodb_kill_idle_transaction.patch (1.3 -> 1.4) , innodb_lru_dump_restore.patch (1.9 -> 1.10) , innodb_opt_lru_count.patch (1.8 -> 1.9) , innodb_overwrite_relay_log_info.patch (1.10 -> 1.11) , innodb_pass_corrupt_table.patch (1.12 -> 1.13) , innodb_recovery_patches.patch (1.10 -> 1.11) , innodb_separate_doublewrite.patch (1.13 -> 1.14) , innodb_show_lock_name.patch (1.9 -> 1.10) , innodb_show_status.patch (1.9 -> 1.10) , innodb_show_status_extend.patch (1.10 -> 1.11) , innodb_show_sys_tables.patch (1.10 -> 1.11) , innodb_split_buf_pool_mutex.patch (1.11 -> 1.12) , innodb_stats.patch (1.10 -> 1.11) , innodb_thread_concurrency_timer_based.patch (1.9 -> 1.10) , log_connection_error.patch (1.7 -> 1.8) , log_warnings_suppress.patch (1.9 -> 1.10) , mysql.spec (1.566 -> 1.567) , optimizer_fix.patch (1.7 -> 1.8) , processlist_row_stats.patch (1.7 -> 1.8) , query_cache_enhance.patch (1.12 -> 1.13) , response_time_distribution.patch (1.11 -> 1.12) , show_slave_status_nolock.patch (1.9 -> 1.10) , show_temp.patch (1.10 -> 1.11) , slow_extended.patch (1.12 -> 1.13) , sql_no_fcache.patch (1.9 -> 1.10) , subunit.patch (1.4 -> 1.5) , userstat.patch (1.11 -> 1.12) , bug917246.patch (NONE -> 1.1) (NEW), sphinx-mysql.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/mysql/bug860910.patch
diff -u packages/mysql/bug860910.patch:1.4 packages/mysql/bug860910.patch:1.5
--- packages/mysql/bug860910.patch:1.4 Wed Jan 11 19:10:25 2012
+++ packages/mysql/bug860910.patch Thu Feb 16 17:26:12 2012
@@ -77,7 +77,7 @@
+--source include/rpl_end.inc
--- a/sql/log.cc
+++ b/sql/log.cc
-@@ -5076,6 +5076,12 @@
+@@ -5112,6 +5112,12 @@
user_var_event->type,
user_var_event->charset_number,
flags);
================================================================
Index: packages/mysql/control_online_alter_index.patch
diff -u packages/mysql/control_online_alter_index.patch:1.7 packages/mysql/control_online_alter_index.patch:1.8
--- packages/mysql/control_online_alter_index.patch:1.7 Wed Jan 11 19:10:25 2012
+++ packages/mysql/control_online_alter_index.patch Thu Feb 16 17:26:12 2012
@@ -58,7 +58,7 @@
for (idx_p= index_drop_buffer, idx_end_p= idx_p + index_drop_count;
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
-@@ -2192,6 +2192,13 @@
+@@ -2265,6 +2265,13 @@
GLOBAL_VAR(opt_optimizer_fix),
NO_CMD_LINE, DEFAULT(TRUE));
================================================================
Index: packages/mysql/group_commit.patch
diff -u packages/mysql/group_commit.patch:1.3 packages/mysql/group_commit.patch:1.4
--- packages/mysql/group_commit.patch:1.3 Fri Jan 20 20:04:21 2012
+++ packages/mysql/group_commit.patch Thu Feb 16 17:26:12 2012
@@ -522,7 +522,7 @@
sync_period_ptr(sync_period),
is_relay_log(0), signal_cnt(0),
description_event_for_exec(0), description_event_for_queue(0)
-@@ -5325,19 +5327,15 @@
+@@ -5361,19 +5363,15 @@
SYNOPSIS
write_cache()
cache Cache to write to the binary log
@@ -544,7 +544,7 @@
if (reinit_io_cache(cache, READ_CACHE, 0, 0, 0))
return ER_ERROR_ON_WRITE;
uint length= my_b_bytes_in_cache(cache), group, carry, hdr_offs;
-@@ -5448,6 +5446,8 @@
+@@ -5484,6 +5482,8 @@
}
/* Write data to the binary log file */
@@ -553,7 +553,7 @@
if (my_b_write(&log_file, cache->read_pos, length))
return ER_ERROR_ON_WRITE;
thd->binlog_bytes_written+= length;
-@@ -5456,9 +5456,6 @@
+@@ -5492,9 +5492,6 @@
DBUG_ASSERT(carry == 0);
@@ -563,7 +563,7 @@
return 0; // All OK
}
-@@ -5499,8 +5496,6 @@
+@@ -5535,8 +5532,6 @@
if (!is_open())
DBUG_RETURN(error);
@@ -572,7 +572,7 @@
Incident incident= INCIDENT_LOST_EVENTS;
Incident_log_event ev(thd, incident, write_error_msg);
if (lock)
-@@ -5549,112 +5544,332 @@
+@@ -5585,112 +5580,332 @@
'cache' needs to be reinitialized after this functions returns.
*/
@@ -971,7 +971,7 @@
/**
Wait until we get a signal that the relay log has been updated.
-@@ -6059,6 +6274,68 @@
+@@ -6095,6 +6310,68 @@
}
@@ -1040,7 +1040,7 @@
/********* transaction coordinator log for 2pc - mmap() based solution *******/
/*
-@@ -6195,6 +6472,7 @@
+@@ -6231,6 +6508,7 @@
mysql_mutex_init(key_LOCK_pool, &LOCK_pool, MY_MUTEX_INIT_FAST);
mysql_cond_init(key_COND_active, &COND_active, 0);
mysql_cond_init(key_COND_pool, &COND_pool, 0);
@@ -1048,7 +1048,7 @@
inited=6;
-@@ -6202,6 +6480,8 @@
+@@ -6238,6 +6516,8 @@
active=pages;
pool=pages+1;
pool_last=pages+npages-1;
@@ -1057,7 +1057,7 @@
return 0;
-@@ -6307,7 +6587,7 @@
+@@ -6343,7 +6623,7 @@
to the position in memory where xid was logged to.
*/
@@ -1066,7 +1066,7 @@
{
int err;
PAGE *p;
-@@ -6446,7 +6726,9 @@
+@@ -6482,7 +6762,9 @@
mysql_mutex_destroy(&LOCK_sync);
mysql_mutex_destroy(&LOCK_active);
mysql_mutex_destroy(&LOCK_pool);
@@ -1076,7 +1076,7 @@
case 5:
data[0]='A'; // garble the first (signature) byte, in case mysql_file_delete fails
case 4:
-@@ -6656,42 +6938,87 @@
+@@ -6692,42 +6974,87 @@
mysql_cond_destroy(&COND_prep_xids);
}
@@ -1176,7 +1176,7 @@
}
int TC_LOG_BINLOG::recover(IO_CACHE *log, Format_description_log_event *fdle)
-@@ -6760,9 +7087,67 @@
+@@ -6796,9 +7123,67 @@
{
return (ulonglong) mysql_bin_log.get_log_file()->pos_in_file;
}
@@ -1244,7 +1244,7 @@
struct st_mysql_storage_engine binlog_storage_engine=
{ MYSQL_HANDLERTON_INTERFACE_VERSION };
-@@ -6777,7 +7162,7 @@
+@@ -6813,7 +7198,7 @@
binlog_init, /* Plugin Init */
NULL, /* Plugin Deinit */
0x0100 /* 1.0 */,
@@ -1446,7 +1446,7 @@
class Log_event_handler
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
-@@ -1490,6 +1490,7 @@
+@@ -1495,6 +1495,7 @@
ha_end();
if (tc_log)
tc_log->close();
@@ -1454,7 +1454,7 @@
delegates_destroy();
xid_cache_free();
table_def_free();
-@@ -4061,6 +4062,8 @@
+@@ -3911,6 +3912,8 @@
query_response_time_init();
#endif // HAVE_RESPONSE_TIME_DISTRIBUTION
/* We have to initialize the storage engines before CSV logging */
@@ -1463,7 +1463,7 @@
init_global_table_stats();
init_global_index_stats();
-@@ -8004,6 +8007,7 @@
+@@ -7872,6 +7875,7 @@
key_LOCK_error_messages, key_LOG_INFO_lock, key_LOCK_thread_count,
key_PARTITION_LOCK_auto_inc;
PSI_mutex_key key_RELAYLOG_LOCK_index;
@@ -1471,7 +1471,7 @@
static PSI_mutex_info all_server_mutexes[]=
{
-@@ -8024,6 +8028,7 @@
+@@ -7892,6 +7896,7 @@
{ &key_delayed_insert_mutex, "Delayed_insert::mutex", 0},
{ &key_hash_filo_lock, "hash_filo::lock", 0},
{ &key_LOCK_active_mi, "LOCK_active_mi", PSI_FLAG_GLOBAL},
@@ -1479,7 +1479,7 @@
{ &key_LOCK_connection_count, "LOCK_connection_count", PSI_FLAG_GLOBAL},
{ &key_LOCK_crypt, "LOCK_crypt", PSI_FLAG_GLOBAL},
{ &key_LOCK_delayed_create, "LOCK_delayed_create", PSI_FLAG_GLOBAL},
-@@ -8039,6 +8044,7 @@
+@@ -7907,6 +7912,7 @@
"LOCK_global_index_stats", PSI_FLAG_GLOBAL},
{ &key_LOCK_gdl, "LOCK_gdl", PSI_FLAG_GLOBAL},
{ &key_LOCK_global_system_variables, "LOCK_global_system_variables", PSI_FLAG_GLOBAL},
@@ -1487,7 +1487,7 @@
{ &key_LOCK_manager, "LOCK_manager", PSI_FLAG_GLOBAL},
{ &key_LOCK_prepared_stmt_count, "LOCK_prepared_stmt_count", PSI_FLAG_GLOBAL},
{ &key_LOCK_rpl_status, "LOCK_rpl_status", PSI_FLAG_GLOBAL},
-@@ -8050,6 +8056,7 @@
+@@ -7918,6 +7924,7 @@
{ &key_LOCK_temporary_tables, "THD::LOCK_temporary_tables", 0},
{ &key_LOCK_user_conn, "LOCK_user_conn", PSI_FLAG_GLOBAL},
{ &key_LOCK_uuid_generator, "LOCK_uuid_generator", PSI_FLAG_GLOBAL},
@@ -1495,7 +1495,7 @@
{ &key_LOG_LOCK_log, "LOG::LOCK_log", 0},
{ &key_master_info_data_lock, "Master_info::data_lock", 0},
{ &key_master_info_run_lock, "Master_info::run_lock", 0},
-@@ -8097,6 +8104,7 @@
+@@ -7965,6 +7972,7 @@
key_TABLE_SHARE_cond, key_user_level_lock_cond,
key_COND_thread_count, key_COND_thread_cache, key_COND_flush_thread_cache;
PSI_cond_key key_RELAYLOG_update_cond;
@@ -1503,7 +1503,7 @@
static PSI_cond_info all_server_conds[]=
{
-@@ -8113,8 +8121,10 @@
+@@ -7981,8 +7989,10 @@
{ &key_RELAYLOG_update_cond, "MYSQL_RELAY_LOG::update_cond", 0},
{ &key_COND_cache_status_changed, "Query_cache::COND_cache_status_changed", 0},
{ &key_COND_manager, "COND_manager", PSI_FLAG_GLOBAL},
@@ -1516,7 +1516,7 @@
{ &key_item_func_sleep_cond, "Item_func_sleep::cond", 0},
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
-@@ -273,6 +273,7 @@
+@@ -274,6 +274,7 @@
key_structure_guard_mutex, key_TABLE_SHARE_LOCK_ha_data,
key_LOCK_error_messages, key_LOCK_thread_count, key_PARTITION_LOCK_auto_inc;
extern PSI_mutex_key key_RELAYLOG_LOCK_index;
@@ -1524,7 +1524,7 @@
extern PSI_rwlock_key key_rwlock_LOCK_grant, key_rwlock_LOCK_logger,
key_rwlock_LOCK_sys_init_connect, key_rwlock_LOCK_sys_init_slave,
-@@ -293,6 +294,7 @@
+@@ -294,6 +295,7 @@
key_TABLE_SHARE_cond, key_user_level_lock_cond,
key_COND_thread_count, key_COND_thread_cache, key_COND_flush_thread_cache;
extern PSI_cond_key key_RELAYLOG_update_cond;
@@ -1552,7 +1552,7 @@
mysql_mutex_destroy(&LOCK_thd_data);
mysql_mutex_destroy(&LOCK_temporary_tables);
#ifndef DBUG_OFF
-@@ -5292,6 +5296,24 @@
+@@ -5297,6 +5301,24 @@
DBUG_RETURN(0);
}
@@ -1887,7 +1887,7 @@
trx_deregister_from_2pc(trx);
-@@ -10982,6 +11149,7 @@
+@@ -10981,6 +11148,7 @@
srv_active_wake_master_thread();
@@ -1895,7 +1895,7 @@
if (thd_sql_command(thd) != SQLCOM_XA_PREPARE
&& (all
|| !thd_test_options(
-@@ -11008,6 +11176,7 @@
+@@ -11007,6 +11175,7 @@
mysql_mutex_lock(&prepare_commit_mutex);
trx_owns_prepare_commit_mutex_set(trx);
}
================================================================
Index: packages/mysql/innodb_adaptive_hash_index_partitions.patch
diff -u packages/mysql/innodb_adaptive_hash_index_partitions.patch:1.12 packages/mysql/innodb_adaptive_hash_index_partitions.patch:1.13
--- packages/mysql/innodb_adaptive_hash_index_partitions.patch:1.12 Fri Jan 20 20:04:21 2012
+++ packages/mysql/innodb_adaptive_hash_index_partitions.patch Thu Feb 16 17:26:12 2012
@@ -851,7 +851,7 @@
#ifdef UNIV_DEBUG
block->page.in_page_hash = FALSE;
-@@ -1427,7 +1428,11 @@
+@@ -1429,7 +1430,11 @@
ulint p;
#ifdef UNIV_SYNC_DEBUG
@@ -864,7 +864,7 @@
#endif /* UNIV_SYNC_DEBUG */
ut_ad(!btr_search_enabled);
-@@ -2142,6 +2147,7 @@
+@@ -2144,6 +2149,7 @@
{
block->check_index_page_at_flush = FALSE;
block->index = NULL;
@@ -874,7 +874,7 @@
block->n_fields = 1;
--- a/storage/innobase/buf/buf0lru.c
+++ b/storage/innobase/buf/buf0lru.c
-@@ -560,7 +560,7 @@
+@@ -576,7 +576,7 @@
mutex_exit(&buf_pool->LRU_list_mutex);
@@ -883,7 +883,7 @@
chunk = buf_pool->chunks;
for (j = buf_pool->n_chunks; j--; chunk++) {
buf_block_t* block = chunk->blocks;
-@@ -572,16 +572,16 @@
+@@ -588,16 +588,16 @@
continue;
}
@@ -905,7 +905,7 @@
--- a/storage/innobase/dict/dict0dict.c
+++ b/storage/innobase/dict/dict0dict.c
-@@ -1846,7 +1846,7 @@
+@@ -1851,7 +1851,7 @@
zero. */
for (;;) {
@@ -916,7 +916,7 @@
}
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
-@@ -11833,6 +11833,11 @@
+@@ -11832,6 +11832,11 @@
"Disable with --skip-innodb-adaptive-hash-index.",
NULL, innodb_adaptive_hash_index_update, TRUE);
@@ -928,7 +928,7 @@
static MYSQL_SYSVAR_ULONG(replication_delay, srv_replication_delay,
PLUGIN_VAR_RQCMDARG,
"Replication thread delay (ms) on the slave server if "
-@@ -12253,6 +12258,7 @@
+@@ -12252,6 +12257,7 @@
MYSQL_SYSVAR(use_sys_stats_table),
MYSQL_SYSVAR(stats_sample_pages),
MYSQL_SYSVAR(adaptive_hash_index),
@@ -1411,7 +1411,7 @@
--- a/storage/innobase/include/buf0buf.h
+++ b/storage/innobase/include/buf0buf.h
-@@ -1580,6 +1580,7 @@
+@@ -1600,6 +1600,7 @@
complete, though: there may
have been hash collisions,
record deletions, etc. */
================================================================
Index: packages/mysql/innodb_admin_command_base.patch
diff -u packages/mysql/innodb_admin_command_base.patch:1.10 packages/mysql/innodb_admin_command_base.patch:1.11
--- packages/mysql/innodb_admin_command_base.patch:1.10 Wed Jan 11 19:10:26 2012
+++ packages/mysql/innodb_admin_command_base.patch Thu Feb 16 17:26:12 2012
@@ -7,7 +7,7 @@
# should be done or reviewed by the maintainer!
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
-@@ -11999,7 +11999,8 @@
+@@ -12041,7 +12041,8 @@
i_s_innodb_sys_foreign_cols,
i_s_innodb_sys_stats,
i_s_innodb_table_stats,
================================================================
Index: packages/mysql/innodb_buffer_pool_pages_i_s.patch
diff -u packages/mysql/innodb_buffer_pool_pages_i_s.patch:1.11 packages/mysql/innodb_buffer_pool_pages_i_s.patch:1.12
--- packages/mysql/innodb_buffer_pool_pages_i_s.patch:1.11 Wed Jan 11 19:10:26 2012
+++ packages/mysql/innodb_buffer_pool_pages_i_s.patch Thu Feb 16 17:26:12 2012
@@ -7,7 +7,7 @@
# should be done or reviewed by the maintainer!
--- a/storage/innobase/buf/buf0buf.c
+++ b/storage/innobase/buf/buf0buf.c
-@@ -4161,6 +4161,36 @@
+@@ -4163,6 +4163,36 @@
mutex_exit(block_mutex);
}
@@ -46,7 +46,7 @@
@return TRUE */
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
-@@ -12296,6 +12296,9 @@
+@@ -12338,6 +12338,9 @@
i_s_innodb_sys_stats,
i_s_innodb_table_stats,
i_s_innodb_index_stats,
@@ -793,7 +793,7 @@
#endif /* i_s_h */
--- a/storage/innobase/include/buf0buf.h
+++ b/storage/innobase/include/buf0buf.h
-@@ -1161,6 +1161,14 @@
+@@ -1181,6 +1181,14 @@
/*===========*/
const buf_pool_t* buf_pool) /*!< in: buffer pool */
__attribute__((nonnull, const));
================================================================
Index: packages/mysql/innodb_buffer_pool_shm.patch
diff -u packages/mysql/innodb_buffer_pool_shm.patch:1.11 packages/mysql/innodb_buffer_pool_shm.patch:1.12
--- packages/mysql/innodb_buffer_pool_shm.patch:1.11 Wed Jan 11 19:10:26 2012
+++ packages/mysql/innodb_buffer_pool_shm.patch Thu Feb 16 17:26:12 2012
@@ -55,7 +55,7 @@
srv_mem_pool_size = (ulint) innobase_additional_mem_pool_size;
srv_n_file_io_threads = (ulint) innobase_file_io_threads;
-@@ -11864,6 +11872,16 @@
+@@ -11863,6 +11871,16 @@
"Number of buffer pool instances, set to higher value on high-end machines to increase scalability",
NULL, NULL, 1L, 1L, MAX_BUFFER_POOLS, 1L);
@@ -72,7 +72,7 @@
static MYSQL_SYSVAR_ULONG(commit_concurrency, innobase_commit_concurrency,
PLUGIN_VAR_RQCMDARG,
"Helps in performance tuning in heavily concurrent environments.",
-@@ -12170,6 +12188,8 @@
+@@ -12209,6 +12227,8 @@
MYSQL_SYSVAR(autoextend_increment),
MYSQL_SYSVAR(buffer_pool_size),
MYSQL_SYSVAR(buffer_pool_instances),
================================================================
Index: packages/mysql/innodb_deadlock_count.patch
diff -u packages/mysql/innodb_deadlock_count.patch:1.9 packages/mysql/innodb_deadlock_count.patch:1.10
--- packages/mysql/innodb_deadlock_count.patch:1.9 Sat Nov 19 16:13:38 2011
+++ packages/mysql/innodb_deadlock_count.patch Thu Feb 16 17:26:12 2012
@@ -28,7 +28,7 @@
Gets the size of a lock struct.
--- a/storage/innobase/include/srv0srv.h
+++ b/storage/innobase/include/srv0srv.h
-@@ -767,6 +767,7 @@
+@@ -770,6 +770,7 @@
ulint innodb_buffer_pool_read_ahead_evicted;/*!< srv_read_ahead evicted*/
ulint innodb_dblwr_pages_written; /*!< srv_dblwr_pages_written */
ulint innodb_dblwr_writes; /*!< srv_dblwr_writes */
@@ -48,7 +48,7 @@
break;
--- a/storage/innobase/srv/srv0srv.c
+++ b/storage/innobase/srv/srv0srv.c
-@@ -474,6 +474,7 @@
+@@ -477,6 +477,7 @@
static ulint srv_n_rows_deleted_old = 0;
static ulint srv_n_rows_read_old = 0;
@@ -56,7 +56,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;
-@@ -2290,6 +2291,7 @@
+@@ -2293,6 +2294,7 @@
export_vars.innodb_buffer_pool_pages_data = LRU_len;
export_vars.innodb_buffer_pool_pages_dirty = flush_list_len;
export_vars.innodb_buffer_pool_pages_free = free_len;
================================================================
Index: packages/mysql/innodb_dict_size_limit.patch
diff -u packages/mysql/innodb_dict_size_limit.patch:1.9 packages/mysql/innodb_dict_size_limit.patch:1.10
--- packages/mysql/innodb_dict_size_limit.patch:1.9 Wed Jan 11 19:10:26 2012
+++ packages/mysql/innodb_dict_size_limit.patch Thu Feb 16 17:26:12 2012
@@ -289,7 +289,7 @@
mutex_exit(&(dict_sys->mutex));
if (table != NULL) {
-@@ -1259,6 +1263,64 @@
+@@ -1264,6 +1268,64 @@
dict_mem_table_free(table);
}
@@ -354,7 +354,7 @@
/****************************************************************//**
If the given column name is reserved for InnoDB system columns, return
TRUE.
-@@ -1763,6 +1825,11 @@
+@@ -1768,6 +1830,11 @@
ut_ad(index->magic_n == DICT_INDEX_MAGIC_N);
ut_ad(mutex_own(&(dict_sys->mutex)));
@@ -377,9 +377,9 @@
{"have_atomic_builtins",
(char*) &export_vars.innodb_have_atomic_builtins, SHOW_BOOL},
{"log_waits",
-@@ -11774,6 +11776,11 @@
- "Choose method of innodb_adaptive_flushing. (native, [estimate], keep_average)",
- NULL, innodb_adaptive_flushing_method_update, 1, &adaptive_flushing_method_typelib);
+@@ -11813,6 +11815,11 @@
+ NULL, NULL, 0, 0, 1, 0);
+ #endif
+static MYSQL_SYSVAR_ULONG(dict_size_limit, srv_dict_size_limit,
+ PLUGIN_VAR_RQCMDARG,
@@ -389,7 +389,7 @@
static struct st_mysql_sys_var* innobase_system_variables[]= {
MYSQL_SYSVAR(additional_mem_pool_size),
MYSQL_SYSVAR(autoextend_increment),
-@@ -11843,6 +11850,7 @@
+@@ -11882,6 +11889,7 @@
MYSQL_SYSVAR(flush_neighbor_pages),
MYSQL_SYSVAR(read_ahead),
MYSQL_SYSVAR(adaptive_flushing_method),
@@ -425,7 +425,7 @@
or freed in a file segment. */
--- a/storage/innobase/include/buf0buf.h
+++ b/storage/innobase/include/buf0buf.h
-@@ -1575,6 +1575,15 @@
+@@ -1595,6 +1595,15 @@
#define BUF_POOL_ZIP_FOLD_BPAGE(b) BUF_POOL_ZIP_FOLD((buf_block_t*) (b))
/* @} */
@@ -495,7 +495,7 @@
/*-------------------------------------------*/
extern ulint srv_n_rows_inserted;
-@@ -714,6 +715,7 @@
+@@ -717,6 +718,7 @@
ulint innodb_data_writes; /*!< I/O write requests */
ulint innodb_data_written; /*!< Data bytes written */
ulint innodb_data_reads; /*!< I/O read requests */
@@ -514,7 +514,7 @@
/*-------------------------------------------*/
UNIV_INTERN ulong srv_n_spin_wait_rounds = 30;
UNIV_INTERN ulong srv_n_free_tickets_to_enter = 500;
-@@ -2222,6 +2224,7 @@
+@@ -2225,6 +2227,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/innodb_expand_fast_index_creation.patch
diff -u packages/mysql/innodb_expand_fast_index_creation.patch:1.6 packages/mysql/innodb_expand_fast_index_creation.patch:1.7
--- packages/mysql/innodb_expand_fast_index_creation.patch:1.6 Wed Jan 11 19:10:26 2012
+++ packages/mysql/innodb_expand_fast_index_creation.patch Thu Feb 16 17:26:12 2012
@@ -884,7 +884,7 @@
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
-@@ -1013,6 +1013,9 @@
+@@ -1014,6 +1014,9 @@
List<Alter_column> alter_list;
List<Key> key_list;
List<Create_field> create_list;
@@ -894,7 +894,7 @@
uint flags;
enum enum_enable_or_disable keys_onoff;
enum tablespace_op_type tablespace_op;
-@@ -1024,6 +1027,8 @@
+@@ -1025,6 +1028,8 @@
Alter_info() :
@@ -903,7 +903,7 @@
flags(0),
keys_onoff(LEAVE_AS_IS),
tablespace_op(NO_TABLESPACE_OP),
-@@ -1039,6 +1044,9 @@
+@@ -1040,6 +1045,9 @@
alter_list.empty();
key_list.empty();
create_list.empty();
@@ -1322,7 +1322,7 @@
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
-@@ -710,6 +710,14 @@
+@@ -783,6 +783,14 @@
ON_CHECK(event_scheduler_check), ON_UPDATE(event_scheduler_update));
#endif
@@ -1425,7 +1425,7 @@
--expire-logs-days=#
If non-zero, binary logs will be purged after
expire_logs_days days; possible purges happen at startup
-@@ -777,6 +781,7 @@
+@@ -781,6 +785,7 @@
div-precision-increment 4
engine-condition-pushdown TRUE
event-scheduler OFF
================================================================
Index: packages/mysql/innodb_expand_import.patch
diff -u packages/mysql/innodb_expand_import.patch:1.10 packages/mysql/innodb_expand_import.patch:1.11
--- packages/mysql/innodb_expand_import.patch:1.10 Wed Jan 11 19:10:26 2012
+++ packages/mysql/innodb_expand_import.patch Thu Feb 16 17:26:12 2012
@@ -51,7 +51,7 @@
#ifndef UNIV_HOTBACKUP
# include "buf0lru.h"
# include "ibuf0ibuf.h"
-@@ -3033,6 +3041,84 @@
+@@ -3041,6 +3049,84 @@
}
/********************************************************************//**
@@ -136,7 +136,7 @@
Tries to open a single-table tablespace and optionally checks the space id is
right in it. If does not succeed, prints an error message to the .err log. This
function is used to open a tablespace when we start up mysqld, and also in
-@@ -3055,8 +3141,11 @@
+@@ -3063,8 +3149,11 @@
accessing the first page of the file */
ulint id, /*!< in: space id */
ulint flags, /*!< in: tablespace flags */
@@ -149,7 +149,7 @@
{
os_file_t file;
char* filepath;
-@@ -3079,7 +3168,7 @@
+@@ -3087,7 +3176,7 @@
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/bug860910.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/control_online_alter_index.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/group_commit.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_adaptive_hash_index_partitions.patch?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_admin_command_base.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_buffer_pool_pages_i_s.patch?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_buffer_pool_shm.patch?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_deadlock_count.patch?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_dict_size_limit.patch?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_expand_fast_index_creation.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_expand_import.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_extend_slow.patch?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_extra_rseg.patch?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_fake_changes.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_fast_checksum.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_files_extend.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_fix_misc.patch?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_io_patches.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_kill_idle_transaction.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_lru_dump_restore.patch?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_opt_lru_count.patch?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_overwrite_relay_log_info.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_pass_corrupt_table.patch?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_recovery_patches.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_separate_doublewrite.patch?r1=1.13&r2=1.14&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_show_lock_name.patch?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_show_status.patch?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_show_status_extend.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_show_sys_tables.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_split_buf_pool_mutex.patch?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_stats.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_thread_concurrency_timer_based.patch?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/log_connection_error.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/log_warnings_suppress.patch?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.566&r2=1.567&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/optimizer_fix.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/processlist_row_stats.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/query_cache_enhance.patch?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/response_time_distribution.patch?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/show_slave_status_nolock.patch?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/show_temp.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/slow_extended.patch?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/sql_no_fcache.patch?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/subunit.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/userstat.patch?r1=1.11&r2=1.12&f=u
More information about the pld-cvs-commit
mailing list