Author: arekm Date: Sat Feb 19 22:17:06 2011 GMT Module: packages Tag: HEAD ---- Log message: - up to 5.5.9
---- Files affected: packages/mysql: bug580324.patch (1.1 -> 1.2) , control_online_alter_index.patch (1.1 -> 1.2) , error_pad.patch (1.1 -> 1.2) , innodb_adaptive_hash_index_partitions.patch (1.1 -> 1.2) , innodb_admin_command_base.patch (1.1 -> 1.2) , innodb_buffer_pool_pages_i_s.patch (1.1 -> 1.2) , innodb_buffer_pool_shm.patch (1.1 -> 1.2) , innodb_deadlock_count.patch (1.1 -> 1.2) , innodb_dict_size_limit.patch (1.1 -> 1.2) , innodb_expand_import.patch (1.1 -> 1.2) , innodb_extend_slow.patch (1.1 -> 1.2) , innodb_extra_rseg.patch (1.1 -> 1.2) , innodb_fast_checksum.patch (1.1 -> 1.2) , innodb_files_extend.patch (1.1 -> 1.2) , innodb_fix_misc.patch (1.1 -> 1.2) , innodb_io_patches.patch (1.1 -> 1.2) , innodb_lru_dump_restore.patch (1.1 -> 1.2) , innodb_opt_lru_count.patch (1.1 -> 1.2) , innodb_overwrite_relay_log_info.patch (1.1 -> 1.2) , innodb_pass_corrupt_table.patch (1.1 -> 1.2) , innodb_recovery_patches.patch (1.1 -> 1.2) , innodb_separate_doublewrite.patch (1.1 -> 1.2) , innodb_show_lock_name.patch ( 1.1 -> 1.2) , innodb_show_status.patch (1.1 -> 1.2) , innodb_show_status_extend.patch (1.1 -> 1.2) , innodb_show_sys_tables.patch (1.1 -> 1.2) , innodb_split_buf_pool_mutex.patch (1.1 -> 1.2) , innodb_stats.patch (1.1 -> 1.2) , innodb_thread_concurrency_timer_based.patch (1.1 -> 1.2) , log_connection_error.patch (1.1 -> 1.2) , log_warnings_silence.patch (1.1 -> 1.2) , microsec_process.patch (1.1 -> 1.2) , mysql-test.diff (1.1 -> 1.2) , mysql.spec (1.521 -> 1.522) , mysql_dump_ignore_ct.patch (1.1 -> 1.2) , mysql_syslog.patch (1.1 -> 1.2) , optimizer_fix.patch (1.1 -> 1.2) , query_cache_enhance.patch (1.1 -> 1.2) , remove_fcntl_excessive_calls.patch (1.1 -> 1.2) , response_time_distribution.patch (1.1 -> 1.2) , show_slave_status_nolock.patch (1.1 -> 1.2) , show_temp.patch (1.1 -> 1.2) , slow_extended.patch (1.1 -> 1.2) , sql_no_fcache.patch (1.1 -> 1.2) , userstat.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: packages/mysql/bug580324.patch diff -u packages/mysql/bug580324.patch:1.1 packages/mysql/bug580324.patch:1.2 --- packages/mysql/bug580324.patch:1.1 Fri Jan 28 10:18:02 2011 +++ packages/mysql/bug580324.patch Sat Feb 19 23:16:58 2011 @@ -26,7 +26,7 @@ diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc --- a/sql/sql_parse.cc 2011-01-11 21:35:26.000000000 +0300 +++ b/sql/sql_parse.cc 2011-01-11 21:48:50.000000000 +0300 -@@ -1110,11 +1110,18 @@ +@@ -1113,11 +1113,18 @@ break; #else { @@ -46,7 +46,7 @@ /* SHOW statements should not add the used tables to the list of tables used in a transaction. -@@ -1127,24 +1134,23 @@ +@@ -1130,24 +1137,23 @@ /* We have name + wildcard in packet, separated by endzero */ @@ -83,7 +83,7 @@ mysql_reset_thd_for_next_command(thd); lex_start(thd); /* Must be before we init the table list. */ -@@ -1169,9 +1175,6 @@ +@@ -1172,9 +1178,6 @@ table_list.schema_table= schema_table; } ================================================================ Index: packages/mysql/control_online_alter_index.patch diff -u packages/mysql/control_online_alter_index.patch:1.1 packages/mysql/control_online_alter_index.patch:1.2 --- packages/mysql/control_online_alter_index.patch:1.1 Fri Jan 28 10:18:02 2011 +++ packages/mysql/control_online_alter_index.patch Sat Feb 19 23:16:59 2011 @@ -43,7 +43,7 @@ diff -ruN a/sql/sql_partition.cc b/sql/sql_partition.cc --- a/sql/sql_partition.cc 2010-11-03 07:01:14.000000000 +0900 +++ b/sql/sql_partition.cc 2010-12-03 13:59:56.444039002 +0900 -@@ -4635,7 +4635,12 @@ +@@ -4636,7 +4636,12 @@ alter_info->num_parts= curr_part_no - new_part_no; } } @@ -60,7 +60,7 @@ diff -ruN a/sql/sql_table.cc b/sql/sql_table.cc --- a/sql/sql_table.cc 2010-11-03 07:01:14.000000000 +0900 +++ b/sql/sql_table.cc 2010-12-03 13:51:04.768955495 +0900 -@@ -6107,6 +6107,10 @@ +@@ -6117,6 +6117,10 @@ uint *idx_end_p; alter_flags= table->file->alter_table_flags(alter_info->flags); @@ -74,7 +74,7 @@ diff -ruN a/sql/sys_vars.cc b/sql/sys_vars.cc --- a/sql/sys_vars.cc 2010-12-02 21:23:05.569356468 +0900 +++ b/sql/sys_vars.cc 2010-12-03 14:05:28.857356603 +0900 -@@ -2124,6 +2124,13 @@ +@@ -2140,6 +2140,13 @@ GLOBAL_VAR(opt_optimizer_fix), NO_CMD_LINE, DEFAULT(TRUE)); ================================================================ Index: packages/mysql/error_pad.patch diff -u packages/mysql/error_pad.patch:1.1 packages/mysql/error_pad.patch:1.2 --- packages/mysql/error_pad.patch:1.1 Fri Jan 28 10:18:02 2011 +++ packages/mysql/error_pad.patch Sat Feb 19 23:16:59 2011 @@ -98,7 +98,7 @@ - DBUG_RETURN(0); + if (!(current_error= parse_padd_string(str, rcount))) + { -+ fprintf(stderr, "Failed to parse the error padd string\n"); ++ fprintf(stderr, "Failed to parse the error pad string\n"); + DBUG_RETURN(0); + } + rcount= current_error->d_code - er_offset; /* Count number of unique errors */ @@ -174,7 +174,7 @@ - if (!(new_error->er_name= get_word(&str))) + if (!(d_code= parse_error_offset(start))) + { -+ fprintf(stderr, "Failed to parse the error padd string '%s' '%s' (d_code doesn't parse)!\n",er_name,str); ++ fprintf(stderr, "Failed to parse the error pad string '%s' '%s' (d_code doesn't parse)!\n",er_name,str); + DBUG_RETURN(0); + } + if (d_code < (uint)(er_offset + er_count)) ================================================================ Index: packages/mysql/innodb_adaptive_hash_index_partitions.patch diff -u packages/mysql/innodb_adaptive_hash_index_partitions.patch:1.1 packages/mysql/innodb_adaptive_hash_index_partitions.patch:1.2 --- packages/mysql/innodb_adaptive_hash_index_partitions.patch:1.1 Fri Jan 28 10:18:02 2011 +++ packages/mysql/innodb_adaptive_hash_index_partitions.patch Sat Feb 19 23:16:59 2011 @@ -110,7 +110,7 @@ } } -@@ -2059,7 +2059,7 @@ +@@ -2060,7 +2060,7 @@ btr_search_update_hash_on_delete(cursor); } @@ -119,7 +119,7 @@ } if (!(flags & BTR_KEEP_SYS_FLAG)) { -@@ -2073,7 +2073,7 @@ +@@ -2074,7 +2074,7 @@ row_upd_rec_in_place(rec, index, offsets, update, page_zip); if (block->is_hashed) { @@ -128,8 +128,8 @@ } if (page_zip && !dict_index_is_clust(index) -@@ -2857,7 +2857,7 @@ - block = btr_cur_get_block(cursor); +@@ -2852,7 +2852,7 @@ + } if (block->is_hashed) { - rw_lock_x_lock(&btr_search_latch); @@ -137,7 +137,7 @@ } page_zip = buf_block_get_page_zip(block); -@@ -2872,7 +2872,7 @@ +@@ -2867,7 +2867,7 @@ } if (block->is_hashed) { @@ -146,7 +146,7 @@ } btr_cur_del_mark_set_clust_rec_log(flags, rec, index, val, trx, -@@ -3003,13 +3003,13 @@ +@@ -2994,13 +2994,13 @@ == dict_table_is_comp(cursor->index->table)); if (block->is_hashed) { @@ -606,37 +606,82 @@ #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */ mem_free(folds); -@@ -1215,10 +1281,10 @@ - mem_heap_t* heap = NULL; +@@ -1216,9 +1282,9 @@ ulint* offsets; + ibool released_search_latch; -- rw_lock_x_lock(&btr_search_latch); -+ rw_lock_x_lock(btr_search_get_latch(index->id)); - //buf_pool_mutex_enter_all(); +- rw_lock_s_lock(&btr_search_latch); ++ rw_lock_s_lock(btr_search_get_latch(index->id)); - table = btr_search_sys->hash_index; + table = btr_search_get_hash_index(index->id); for (j = 0; j < srv_buf_pool_instances; j++) { buf_pool_t* buf_pool; -@@ -1291,6 +1357,7 @@ +@@ -1252,7 +1318,7 @@ - block->is_hashed = FALSE; - block->index = NULL; -+ block->btr_search_latch = NULL; - + + /* keeping latch order */ +- rw_lock_s_unlock(&btr_search_latch); ++ rw_lock_s_unlock(btr_search_get_latch(index->id)); + released_search_latch = TRUE; + rw_lock_x_lock(&block->lock); + +@@ -1304,7 +1370,7 @@ + mem_heap_empty(heap); + } + +- rw_lock_x_lock(&btr_search_latch); ++ rw_lock_x_lock(btr_search_get_latch(index->id)); + + if (UNIV_UNLIKELY(!block->is_hashed)) { + goto cleanup; +@@ -1314,12 +1380,12 @@ + + if (UNIV_UNLIKELY(block->curr_n_fields != n_fields) + || UNIV_UNLIKELY(block->curr_n_bytes != n_bytes)) { +- rw_lock_x_unlock(&btr_search_latch); ++ rw_lock_x_unlock(btr_search_get_latch(index->id)); + rw_lock_x_unlock(&block->lock); + + mem_free(folds); + +- rw_lock_s_lock(&btr_search_latch); ++ rw_lock_s_lock(btr_search_get_latch(index->id)); + goto retry; + } + +@@ -1333,6 +1399,7 @@ + + block->is_hashed = FALSE; + block->index = NULL; ++ block->btr_search_latch = NULL; + + cleanup: #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG - if (UNIV_UNLIKELY(block->n_pointers)) { -@@ -1313,7 +1380,7 @@ +@@ -1345,18 +1412,18 @@ + index->name, (ulong) block->n_pointers); + } + #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */ +- rw_lock_x_unlock(&btr_search_latch); ++ rw_lock_x_unlock(btr_search_get_latch(index->id)); + rw_lock_x_unlock(&block->lock); + + mem_free(folds); + +- rw_lock_s_lock(&btr_search_latch); ++ rw_lock_s_lock(btr_search_get_latch(index->id)); + } + } + } while (released_search_latch); } - //buf_pool_mutex_exit_all(); -- rw_lock_x_unlock(&btr_search_latch); -+ rw_lock_x_unlock(btr_search_get_latch(index->id)); +- rw_lock_s_unlock(&btr_search_latch); ++ rw_lock_s_unlock(btr_search_get_latch(index->id)); if (UNIV_LIKELY_NULL(heap)) { mem_heap_free(heap); -@@ -1360,7 +1427,7 @@ +@@ -1403,7 +1470,7 @@ buf_block_dbg_add_level(block, SYNC_TREE_NODE_FROM_HASH); @@ -645,7 +690,7 @@ } mtr_commit(&mtr); -@@ -1402,26 +1469,26 @@ +@@ -1445,26 +1512,26 @@ ut_ad(index); ut_a(!dict_index_is_ibuf(index)); @@ -678,7 +723,7 @@ } n_recs = page_get_n_recs(page); -@@ -1515,9 +1582,9 @@ +@@ -1558,9 +1625,9 @@ fold = next_fold; } @@ -690,7 +735,7 @@ if (UNIV_UNLIKELY(btr_search_fully_disabled)) { goto exit_func; -@@ -1545,6 +1612,7 @@ +@@ -1588,6 +1655,7 @@ block->curr_n_bytes = n_bytes; block->curr_left_side = left_side; block->index = index; @@ -698,7 +743,7 @@ for (i = 0; i < n_cached; i++) { -@@ -1552,7 +1620,7 @@ +@@ -1595,7 +1663,7 @@ } exit_func: @@ -707,7 +752,7 @@ mem_free(folds); mem_free(recs); -@@ -1591,13 +1659,13 @@ +@@ -1634,13 +1702,13 @@ ut_a(!(new_block->is_hashed || block->is_hashed) || !dict_index_is_ibuf(index)); @@ -724,7 +769,7 @@ return; } -@@ -1612,7 +1680,7 @@ +@@ -1655,7 +1723,7 @@ new_block->n_bytes = block->curr_n_bytes; new_block->left_side = left_side; @@ -733,7 +778,7 @@ ut_a(n_fields + n_bytes > 0); -@@ -1624,7 +1692,7 @@ +@@ -1667,7 +1735,7 @@ return; } @@ -742,7 +787,7 @@ } /********************************************************************//** -@@ -1663,7 +1731,7 @@ +@@ -1706,7 +1774,7 @@ ut_a(block->curr_n_fields + block->curr_n_bytes > 0); ut_a(!dict_index_is_ibuf(cursor->index)); @@ -751,7 +796,7 @@ index_id = cursor->index->id; fold = rec_fold(rec, rec_get_offsets(rec, cursor->index, offsets_, -@@ -1672,11 +1740,11 @@ +@@ -1715,11 +1783,11 @@ if (UNIV_LIKELY_NULL(heap)) { mem_heap_free(heap); } @@ -765,7 +810,7 @@ } /********************************************************************//** -@@ -1710,21 +1778,21 @@ +@@ -1753,21 +1821,21 @@ ut_a(block->index == cursor->index); ut_a(!dict_index_is_ibuf(cursor->index)); @@ -791,7 +836,7 @@ btr_search_update_hash_on_insert(cursor); } -@@ -1759,9 +1827,9 @@ +@@ -1802,9 +1870,9 @@ ulint* offsets = offsets_; rec_offs_init(offsets_); @@ -803,7 +848,7 @@ rec = btr_cur_get_rec(cursor); -@@ -1806,7 +1874,7 @@ +@@ -1849,7 +1917,7 @@ } else { if (left_side) { @@ -812,7 +857,7 @@ locked = TRUE; -@@ -1820,7 +1888,7 @@ +@@ -1863,7 +1931,7 @@ if (!locked) { @@ -821,7 +866,7 @@ locked = TRUE; } -@@ -1838,7 +1906,7 @@ +@@ -1881,7 +1949,7 @@ if (!left_side) { if (!locked) { @@ -830,7 +875,7 @@ locked = TRUE; } -@@ -1853,7 +1921,7 @@ +@@ -1896,7 +1964,7 @@ if (!locked) { @@ -839,7 +884,7 @@ locked = TRUE; } -@@ -1876,7 +1944,7 @@ +@@ -1919,7 +1987,7 @@ mem_heap_free(heap); } if (locked) { @@ -848,7 +893,7 @@ } } -@@ -1892,7 +1960,7 @@ +@@ -1935,7 +2003,7 @@ ha_node_t* node; ulint n_page_dumps = 0; ibool ok = TRUE; @@ -857,7 +902,7 @@ ulint cell_count; mem_heap_t* heap = NULL; ulint offsets_[REC_OFFS_NORMAL_SIZE]; -@@ -1904,23 +1972,25 @@ +@@ -1947,23 +2015,25 @@ rec_offs_init(offsets_); @@ -888,7 +933,7 @@ for (; node != NULL; node = node->next) { const buf_block_t* block -@@ -2029,19 +2099,21 @@ +@@ -2072,19 +2142,21 @@ give other queries a chance to run. */ if (i != 0) { buf_pool_page_hash_x_unlock_all(); @@ -984,7 +1029,7 @@ diff -ruN a/storage/innobase/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c --- a/storage/innobase/dict/dict0dict.c 2010-12-04 15:52:23.398513916 +0900 +++ b/storage/innobase/dict/dict0dict.c 2010-12-04 16:12:48.662550715 +0900 -@@ -1802,7 +1802,7 @@ +@@ -1806,7 +1806,7 @@ zero. */ for (;;) { @@ -1009,7 +1054,7 @@ diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc --- a/storage/innobase/handler/ha_innodb.cc 2010-12-04 16:12:20.185850734 +0900 +++ b/storage/innobase/handler/ha_innodb.cc 2010-12-04 16:12:48.674552412 +0900 -@@ -11611,6 +11611,11 @@ +@@ -11617,6 +11617,11 @@ "Disable with --skip-innodb-adaptive-hash-index.", NULL, innodb_adaptive_hash_index_update, TRUE); @@ -1021,7 +1066,7 @@ static MYSQL_SYSVAR_ULONG(replication_delay, srv_replication_delay, PLUGIN_VAR_RQCMDARG, "Replication thread delay (ms) on the slave server if " -@@ -11963,6 +11968,7 @@ +@@ -11964,6 +11969,7 @@ MYSQL_SYSVAR(use_sys_stats_table), MYSQL_SYSVAR(stats_sample_pages), MYSQL_SYSVAR(adaptive_hash_index), @@ -1217,7 +1262,7 @@ diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h --- a/storage/innobase/include/buf0buf.h 2010-12-15 19:00:07.713604580 +0900 +++ b/storage/innobase/include/buf0buf.h 2010-12-15 20:58:03.546839883 +0900 -@@ -1473,7 +1473,7 @@ +@@ -1544,7 +1544,7 @@ pointers in the adaptive hash index pointing to this frame */ #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */ @@ -1226,7 +1271,7 @@ already been built on this page; note that it does not guarantee that the index is -@@ -1487,6 +1487,7 @@ +@@ -1558,6 +1558,7 @@ unsigned curr_left_side:1;/*!< TRUE or FALSE in hash indexing */ dict_index_t* index; /*!< Index for which the adaptive hash index has been created. */ @@ -1424,7 +1469,7 @@ diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c --- a/storage/innobase/srv/srv0srv.c 2010-12-04 16:12:20.231484679 +0900 +++ b/storage/innobase/srv/srv0srv.c 2010-12-04 16:12:48.726551018 +0900 -@@ -2008,7 +2008,9 @@ +@@ -2042,7 +2042,9 @@ "-------------------------------------\n", file); ibuf_print(file); @@ -1435,7 +1480,7 @@ fprintf(file, "%.2f hash searches/s, %.2f non-hash searches/s\n", -@@ -2033,14 +2035,15 @@ +@@ -2067,14 +2069,15 @@ ut_total_allocated_memory, mem_pool_get_reserved(mem_comm_pool)); /* Calcurate reserved memories */ @@ -1455,7 +1500,7 @@ lock_sys_subtotal = 0; if (trx_sys) { -@@ -2067,10 +2070,10 @@ +@@ -2101,10 +2104,10 @@ " Threads %lu \t(%lu + %lu)\n", (ulong) (btr_search_sys ================================================================ Index: packages/mysql/innodb_admin_command_base.patch diff -u packages/mysql/innodb_admin_command_base.patch:1.1 packages/mysql/innodb_admin_command_base.patch:1.2 --- packages/mysql/innodb_admin_command_base.patch:1.1 Fri Jan 28 10:18:02 2011 +++ packages/mysql/innodb_admin_command_base.patch Sat Feb 19 23:16:59 2011 @@ -8,7 +8,7 @@ diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc --- a/storage/innobase/handler/ha_innodb.cc 2010-12-03 17:32:15.624039043 +0900 +++ b/storage/innobase/handler/ha_innodb.cc 2010-12-03 17:32:35.424957827 +0900 -@@ -11775,7 +11775,8 @@ +@@ -11772,7 +11772,8 @@ i_s_innodb_sys_foreign_cols, i_s_innodb_sys_stats, i_s_innodb_table_stats, @@ -21,7 +21,7 @@ diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc --- a/storage/innobase/handler/i_s.cc 2010-12-03 17:30:16.299955549 +0900 +++ b/storage/innobase/handler/i_s.cc 2010-12-03 17:32:35.425989972 +0900 -@@ -4162,3 +4162,139 @@ +@@ -4161,3 +4161,139 @@ STRUCT_FLD(system_vars, NULL), STRUCT_FLD(__reserved1, NULL) }; ================================================================ Index: packages/mysql/innodb_buffer_pool_pages_i_s.patch diff -u packages/mysql/innodb_buffer_pool_pages_i_s.patch:1.1 packages/mysql/innodb_buffer_pool_pages_i_s.patch:1.2 --- packages/mysql/innodb_buffer_pool_pages_i_s.patch:1.1 Fri Jan 28 10:18:02 2011 +++ packages/mysql/innodb_buffer_pool_pages_i_s.patch Sat Feb 19 23:16:59 2011 @@ -8,7 +8,7 @@ diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c --- a/storage/innobase/buf/buf0buf.c 2010-12-04 20:20:44.595483291 +0900 +++ b/storage/innobase/buf/buf0buf.c 2010-12-06 19:28:04.055227506 +0900 -@@ -4514,6 +4514,36 @@ +@@ -4515,6 +4515,36 @@ mutex_exit(block_mutex); } @@ -69,7 +69,7 @@ } static const char plugin_author[] = "Innobase Oy"; -@@ -4329,3 +4330,701 @@ +@@ -4328,3 +4329,701 @@ STRUCT_FLD(system_vars, NULL), STRUCT_FLD(__reserved1, NULL) }; @@ -786,7 +786,7 @@ diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h --- a/storage/innobase/include/buf0buf.h 2010-12-04 19:46:40.197471531 +0900 +++ b/storage/innobase/include/buf0buf.h 2010-12-06 19:23:47.638195824 +0900 -@@ -1072,6 +1072,14 @@ +@@ -1143,6 +1143,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.1 packages/mysql/innodb_buffer_pool_shm.patch:1.2 --- packages/mysql/innodb_buffer_pool_shm.patch:1.1 Fri Jan 28 10:18:02 2011 +++ packages/mysql/innodb_buffer_pool_shm.patch Sat Feb 19 23:16:59 2011 @@ -41,9 +41,9 @@ /* prototypes for new functions added to ha_innodb.cc */ trx_t* innobase_get_trx(); @@ -342,6 +346,31 @@ - was allocated for the frames */ - buf_block_t* blocks; /*!< array of buffer control blocks */ - }; + // was allocated for the frames */ + // buf_block_t* blocks; /*!< array of buffer control blocks */ + //}; + +/* Buffer pool shared memory segment information */ +typedef struct buf_shm_info_struct buf_shm_info_t; @@ -182,7 +182,7 @@ + + /* FIXME: This is vague id still */ + binary_id = (ulint) ((byte*)mtr_commit - (byte*)btr_root_get) -+ + (ulint) ((byte*)os_get_os_version - (byte*)buf_calc_page_new_checksum) ++ + (ulint) ((byte*)os_file_get_last_error - (byte*)buf_calc_page_new_checksum) + + (ulint) ((byte*)page_dir_find_owner_slot - (byte*)dfield_data_is_binary_equal) + + (ulint) ((byte*)que_graph_publish - (byte*)dict_casedn_str) + + (ulint) ((byte*)read_view_oldest_copy_or_open_new - (byte*)fil_space_get_version) @@ -736,7 +736,7 @@ static char* internal_innobase_data_file_path = NULL; -@@ -2620,6 +2621,14 @@ +@@ -2624,6 +2625,14 @@ srv_buf_pool_size = (ulint) innobase_buffer_pool_size; srv_buf_pool_instances = (ulint) innobase_buffer_pool_instances; @@ -751,7 +751,7 @@ srv_mem_pool_size = (ulint) innobase_additional_mem_pool_size; srv_n_file_io_threads = (ulint) innobase_file_io_threads; -@@ -2636,6 +2645,7 @@ +@@ -2640,6 +2649,7 @@ srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite; srv_use_checksums = (ibool) innobase_use_checksums; srv_fast_checksum = (ibool) innobase_fast_checksum; @@ -759,7 +759,7 @@ #ifdef HAVE_LARGE_PAGES if ((os_use_large_pages = (ibool) my_use_large_pages)) -@@ -11642,6 +11652,16 @@ +@@ -11648,6 +11658,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); @@ -776,7 +776,7 @@ static MYSQL_SYSVAR_ULONG(commit_concurrency, innobase_commit_concurrency, PLUGIN_VAR_RQCMDARG, "Helps in performance tuning in heavily concurrent environments.", -@@ -11921,6 +11941,8 @@ +@@ -11922,6 +11942,8 @@ MYSQL_SYSVAR(autoextend_increment), <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/bug580324.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/control_online_alter_index.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/error_pad.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_adaptive_hash_index_partitions.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_admin_command_base.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_buffer_pool_pages_i_s.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_buffer_pool_shm.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_deadlock_count.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_dict_size_limit.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_expand_import.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_extend_slow.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_extra_rseg.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_fast_checksum.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_files_extend.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_fix_misc.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_io_patches.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_lru_dump_restore.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_opt_lru_count.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_overwrite_relay_log_info.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_pass_corrupt_table.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_recovery_patches.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_separate_doublewrite.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_show_lock_name.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_show_status.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_show_status_extend.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_show_sys_tables.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_split_buf_pool_mutex.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_stats.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_thread_concurrency_timer_based.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/log_connection_error.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/log_warnings_silence.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/microsec_process.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-test.diff?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.521&r2=1.522&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql_dump_ignore_ct.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql_syslog.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/optimizer_fix.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/query_cache_enhance.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/remove_fcntl_excessive_calls.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/response_time_distribution.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/show_slave_status_nolock.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/show_temp.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/slow_extended.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/sql_no_fcache.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/userstat.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit