Percona Server with XtraDB

Merge lp:~percona-dev/percona-server/5.1.54-fix-bug602047 into lp:percona-server/release-5.1.54-12

Proposed by Yasufumi Kinoshita on 2011-02-08
Status: Merged
Merged at revision: 195
Proposed branch: lp:~percona-dev/percona-server/5.1.54-fix-bug602047
Merge into: lp:percona-server/release-5.1.54-12
Diff against target: 525 lines (+62/-50) 16 files modified
To merge this branch: bzr merge lp:~percona-dev/percona-server/5.1.54-fix-bug602047
Reviewer Review Type Date Requested Status
Alexey Kopytov 2011-02-08 Approve on 2011-02-09
Valentine Gostev (community) qa 2011-02-08 Approve on 2011-02-08
Percona developers 2011-02-08 Pending
Review via email: mp+48866@code.launchpad.net
To post a comment you must log in.
Valentine Gostev (longbow) wrote :

Test case passes. Manual reproducing - feature works fine.

review: Approve (qa)
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

1=== modified file 'innodb_adjust_defaults.patch'
2--- innodb_adjust_defaults.patch 2010-12-16 11:35:26 +0000
3+++ innodb_adjust_defaults.patch 2011-02-08 02:15:10 +0000
4@@ -8,7 +8,7 @@
5 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
6 --- a/storage/innodb_plugin/handler/ha_innodb.cc 2010-04-30 16:39:14.000000000 +0900
7 +++ b/storage/innodb_plugin/handler/ha_innodb.cc 2010-04-30 16:43:26.000000000 +0900
8-@@ -11210,7 +11210,7 @@
9+@@ -11215,7 +11215,7 @@
10 static MYSQL_SYSVAR_ULONG(use_purge_thread, srv_use_purge_thread,
11 PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
12 "Number of purge devoted threads. #### over 1 is EXPERIMENTAL ####",
13@@ -17,7 +17,7 @@
14
15 static MYSQL_SYSVAR_BOOL(overwrite_relay_log_info, innobase_overwrite_relay_log_info,
16 PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
17-@@ -11310,7 +11310,7 @@
18+@@ -11315,7 +11315,7 @@
19 static MYSQL_SYSVAR_BOOL(adaptive_flushing, srv_adaptive_flushing,
20 PLUGIN_VAR_NOCMDARG,
21 "Attempt flushing dirty pages to avoid IO bursts at checkpoints.",
22@@ -26,7 +26,7 @@
23
24 static MYSQL_SYSVAR_ULONG(max_purge_lag, srv_max_purge_lag,
25 PLUGIN_VAR_RQCMDARG,
26-@@ -11555,7 +11555,7 @@
27+@@ -11560,7 +11560,7 @@
28 static MYSQL_SYSVAR_ULONG(ibuf_active_contract, srv_ibuf_active_contract,
29 PLUGIN_VAR_RQCMDARG,
30 "Enable/Disable active_contract of insert buffer. 0:disable 1:enable",
31@@ -35,7 +35,7 @@
32
33 static MYSQL_SYSVAR_ULONG(ibuf_accel_rate, srv_ibuf_accel_rate,
34 PLUGIN_VAR_RQCMDARG,
35-@@ -11635,8 +11635,8 @@
36+@@ -11640,8 +11640,8 @@
37 };
38 static MYSQL_SYSVAR_ENUM(adaptive_checkpoint, srv_adaptive_checkpoint,
39 PLUGIN_VAR_RQCMDARG,
40
41=== modified file 'innodb_admin_command_base.patch'
42--- innodb_admin_command_base.patch 2010-12-16 11:35:26 +0000
43+++ innodb_admin_command_base.patch 2011-02-08 02:15:10 +0000
44@@ -8,7 +8,7 @@
45 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
46 --- a/storage/innodb_plugin/handler/ha_innodb.cc 2010-08-27 16:27:30.222410116 +0900
47 +++ b/storage/innodb_plugin/handler/ha_innodb.cc 2010-08-27 16:27:44.073104773 +0900
48-@@ -11534,6 +11534,7 @@
49+@@ -11539,6 +11539,7 @@
50 i_s_innodb_cmpmem_reset,
51 i_s_innodb_table_stats,
52 i_s_innodb_index_stats,
53
54=== modified file 'innodb_buffer_pool_shm.patch'
55--- innodb_buffer_pool_shm.patch 2010-12-16 11:35:26 +0000
56+++ innodb_buffer_pool_shm.patch 2011-02-08 02:15:10 +0000
57@@ -683,7 +683,7 @@
58
59 #ifdef HAVE_LARGE_PAGES
60 if ((os_use_large_pages = (ibool) my_use_large_pages))
61-@@ -11405,6 +11407,16 @@
62+@@ -11410,6 +11412,16 @@
63 "The size of the memory buffer InnoDB uses to cache data and indexes of its tables.",
64 NULL, NULL, 128*1024*1024L, 32*1024*1024L, LONGLONG_MAX, 1024*1024L);
65
66@@ -700,7 +700,7 @@
67 static MYSQL_SYSVAR_ULONG(commit_concurrency, innobase_commit_concurrency,
68 PLUGIN_VAR_RQCMDARG,
69 "Helps in performance tuning in heavily concurrent environments.",
70-@@ -11680,6 +11692,8 @@
71+@@ -11685,6 +11697,8 @@
72 MYSQL_SYSVAR(additional_mem_pool_size),
73 MYSQL_SYSVAR(autoextend_increment),
74 MYSQL_SYSVAR(buffer_pool_size),
75
76=== modified file 'innodb_extend_slow.patch'
77--- innodb_extend_slow.patch 2011-02-02 14:49:16 +0000
78+++ innodb_extend_slow.patch 2011-02-08 02:15:10 +0000
79@@ -428,7 +428,7 @@
80 /*********************************************************************//**
81 Construct ha_innobase handler. */
82 UNIV_INTERN
83-@@ -8940,6 +8976,25 @@
84+@@ -8945,6 +8981,25 @@
85 statement has ended */
86
87 if (trx->n_mysql_tables_in_use == 0) {
88@@ -766,7 +766,7 @@
89
90 if ((ulint)ret == n) {
91
92-@@ -3642,10 +3677,11 @@
93+@@ -3642,10 +3676,11 @@
94 (can be used to identify a completed
95 aio operation); ignored if mode is
96 OS_AIO_SYNC */
97@@ -779,7 +779,7 @@
98 {
99 os_aio_array_t* array;
100 os_aio_slot_t* slot;
101-@@ -3687,8 +3723,8 @@
102+@@ -3687,8 +3722,8 @@
103 wait in the Windows case. */
104
105 if (type == OS_FILE_READ) {
106@@ -790,7 +790,7 @@
107 }
108
109 ut_a(type == OS_FILE_WRITE);
110-@@ -3721,6 +3757,11 @@
111+@@ -3721,6 +3756,11 @@
112 ut_error;
113 }
114
115
116=== modified file 'innodb_fast_checksum.patch'
117--- innodb_fast_checksum.patch 2010-12-16 11:35:26 +0000
118+++ innodb_fast_checksum.patch 2011-02-08 02:15:10 +0000
119@@ -178,7 +178,7 @@
120
121 #ifdef HAVE_LARGE_PAGES
122 if ((os_use_large_pages = (ibool) my_use_large_pages))
123-@@ -11105,6 +11107,15 @@
124+@@ -11110,6 +11112,15 @@
125 "Disable with --skip-innodb-checksums.",
126 NULL, NULL, TRUE);
127
128@@ -194,7 +194,7 @@
129 static MYSQL_SYSVAR_STR(data_home_dir, innobase_data_home_dir,
130 PLUGIN_VAR_READONLY,
131 "The common part for InnoDB table spaces.",
132-@@ -11597,6 +11608,7 @@
133+@@ -11602,6 +11613,7 @@
134 MYSQL_SYSVAR(autoextend_increment),
135 MYSQL_SYSVAR(buffer_pool_size),
136 MYSQL_SYSVAR(checksums),
137
138=== modified file 'innodb_fast_shutdown.patch'
139--- innodb_fast_shutdown.patch 2010-12-13 11:43:12 +0000
140+++ innodb_fast_shutdown.patch 2011-02-08 02:15:10 +0000
141@@ -212,7 +212,7 @@
142
143 if (srv_shutdown_state >= SRV_SHUTDOWN_CLEANUP) {
144 goto exit_func;
145-@@ -2770,7 +2773,7 @@
146+@@ -2773,7 +2776,7 @@
147 if (!skip_sleep) {
148 if (next_itr_time > cur_time) {
149
150@@ -221,7 +221,7 @@
151 srv_main_sleeps++;
152
153 /*
154-@@ -3476,9 +3479,10 @@
155+@@ -3480,9 +3483,10 @@
156 mutex_exit(&kernel_mutex);
157
158 sleep_ms = 10;
159
160=== modified file 'innodb_files_extend.patch'
161--- innodb_files_extend.patch 2011-02-02 14:49:16 +0000
162+++ innodb_files_extend.patch 2011-02-08 02:15:10 +0000
163@@ -187,7 +187,7 @@
164 #ifndef MYSQL_SERVER
165 innodb_overwrite_relay_log_info = FALSE;
166 #endif
167-@@ -7004,9 +7063,9 @@
168+@@ -7009,9 +7068,9 @@
169 | DICT_TF_COMPACT
170 | DICT_TF_FORMAT_ZIP
171 << DICT_TF_FORMAT_SHIFT;
172@@ -200,7 +200,7 @@
173 }
174 }
175
176-@@ -11116,6 +11175,16 @@
177+@@ -11121,6 +11180,16 @@
178 "#### Attention: The checksum is not compatible for normal or disabled version! ####",
179 NULL, NULL, FALSE);
180
181@@ -217,7 +217,7 @@
182 static MYSQL_SYSVAR_STR(data_home_dir, innobase_data_home_dir,
183 PLUGIN_VAR_READONLY,
184 "The common part for InnoDB table spaces.",
185-@@ -11604,6 +11673,8 @@
186+@@ -11609,6 +11678,8 @@
187 NULL, NULL, 0, 0, 1, 0);
188
189 static struct st_mysql_sys_var* innobase_system_variables[]= {
190
191=== modified file 'innodb_fix_misc.patch'
192--- innodb_fix_misc.patch 2011-02-02 14:49:16 +0000
193+++ innodb_fix_misc.patch 2011-02-08 02:15:10 +0000
194@@ -8,7 +8,7 @@
195 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
196 --- a/storage/innodb_plugin/handler/ha_innodb.cc 2010-08-27 16:50:59.626327847 +0900
197 +++ b/storage/innodb_plugin/handler/ha_innodb.cc 2010-08-27 16:55:20.281021252 +0900
198-@@ -11770,7 +11770,7 @@
199+@@ -11775,7 +11775,7 @@
200 &innobase_storage_engine,
201 innobase_hton_name,
202 "Innobase Oy",
203
204=== modified file 'innodb_lru_dump_restore.patch'
205--- innodb_lru_dump_restore.patch 2011-02-02 14:49:16 +0000
206+++ innodb_lru_dump_restore.patch 2011-02-08 02:15:10 +0000
207@@ -409,7 +409,7 @@
208 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
209 --- a/storage/innodb_plugin/handler/ha_innodb.cc 2010-10-01 09:57:56.486228425 +0900
210 +++ b/storage/innodb_plugin/handler/ha_innodb.cc 2010-10-01 10:00:13.292228546 +0900
211-@@ -11473,6 +11473,12 @@
212+@@ -11478,6 +11478,12 @@
213 "Limit the allocated memory for dictionary cache. (0: unlimited)",
214 NULL, NULL, 0, 0, LONG_MAX, 0);
215
216@@ -422,7 +422,7 @@
217 static struct st_mysql_sys_var* innobase_system_variables[]= {
218 MYSQL_SYSVAR(additional_mem_pool_size),
219 MYSQL_SYSVAR(autoextend_increment),
220-@@ -11555,6 +11561,7 @@
221+@@ -11560,6 +11566,7 @@
222 #endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
223 MYSQL_SYSVAR(read_ahead_threshold),
224 MYSQL_SYSVAR(io_capacity),
225
226=== modified file 'innodb_pass_corrupt_table.patch'
227--- innodb_pass_corrupt_table.patch 2011-02-02 14:49:16 +0000
228+++ innodb_pass_corrupt_table.patch 2011-02-08 02:15:10 +0000
229@@ -899,7 +899,7 @@
230 switch (ret) {
231 case DB_SUCCESS:
232 error = 0;
233-@@ -5852,6 +5903,10 @@
234+@@ -5857,6 +5908,10 @@
235 {
236 DBUG_ENTER("change_active_index");
237
238@@ -910,7 +910,7 @@
239 ut_ad(user_thd == ha_thd());
240 ut_a(prebuilt->trx == thd_to_trx(user_thd));
241
242-@@ -5942,6 +5997,10 @@
243+@@ -5947,6 +6002,10 @@
244
245 DBUG_ENTER("general_fetch");
246
247@@ -921,7 +921,7 @@
248 ut_a(prebuilt->trx == thd_to_trx(user_thd));
249
250 innodb_srv_conc_enter_innodb(prebuilt->trx);
251-@@ -5951,6 +6010,10 @@
252+@@ -5956,6 +6015,10 @@
253
254 innodb_srv_conc_exit_innodb(prebuilt->trx);
255
256@@ -932,7 +932,7 @@
257 switch (ret) {
258 case DB_SUCCESS:
259 error = 0;
260-@@ -7201,6 +7264,10 @@
261+@@ -7206,6 +7269,10 @@
262 DBUG_RETURN(my_errno=HA_ERR_WRONG_COMMAND);
263 }
264
265@@ -943,7 +943,7 @@
266 /* Truncate the table in InnoDB */
267
268 error = row_truncate_table_for_mysql(prebuilt->table, prebuilt->trx);
269-@@ -7209,6 +7276,10 @@
270+@@ -7214,6 +7281,10 @@
271 goto fallback;
272 }
273
274@@ -954,7 +954,7 @@
275 error = convert_error_code_to_mysql(error, prebuilt->table->flags,
276 NULL);
277
278-@@ -7721,6 +7792,16 @@
279+@@ -7726,6 +7797,16 @@
280 return(ranges + (double) rows / (double) total_rows * time_for_scan);
281 }
282
283@@ -971,7 +971,7 @@
284 /*********************************************************************//**
285 Calculates the key number used inside MySQL for an Innobase index. We will
286 first check the "index translation table" for a match of the index to get
287-@@ -7842,7 +7923,7 @@
288+@@ -7847,7 +7928,7 @@
289 ib_table = prebuilt->table;
290
291 if (flag & HA_STATUS_TIME) {
292@@ -980,7 +980,7 @@
293 /* In sql_show we call with this flag: update
294 then statistics so that they are up-to-date */
295
296-@@ -8133,10 +8214,18 @@
297+@@ -8138,10 +8219,18 @@
298 THD* thd, /*!< in: connection thread handle */
299 HA_CHECK_OPT* check_opt) /*!< in: currently ignored */
300 {
301@@ -999,7 +999,7 @@
302 return(0);
303 }
304
305-@@ -8318,6 +8407,10 @@
306+@@ -8323,6 +8412,10 @@
307 my_error(ER_QUERY_INTERRUPTED, MYF(0));
308 }
309
310@@ -1010,7 +1010,7 @@
311 DBUG_RETURN(is_ok ? HA_ADMIN_OK : HA_ADMIN_CORRUPT);
312 }
313
314-@@ -9043,6 +9136,10 @@
315+@@ -9048,6 +9141,10 @@
316
317 update_thd(thd);
318
319@@ -1021,7 +1021,7 @@
320 if (prebuilt->table->ibd_file_missing && !thd_tablespace_op(thd)) {
321 ut_print_timestamp(stderr);
322 fprintf(stderr,
323-@@ -11487,6 +11584,14 @@
324+@@ -11492,6 +11589,14 @@
325 "0 (the default) disables automatic dumps.",
326 NULL, NULL, 0, 0, UINT_MAX32, 0);
327
328@@ -1036,7 +1036,7 @@
329 static struct st_mysql_sys_var* innobase_system_variables[]= {
330 MYSQL_SYSVAR(additional_mem_pool_size),
331 MYSQL_SYSVAR(autoextend_increment),
332-@@ -11572,6 +11677,7 @@
333+@@ -11577,6 +11682,7 @@
334 MYSQL_SYSVAR(io_capacity),
335 MYSQL_SYSVAR(auto_lru_dump),
336 MYSQL_SYSVAR(use_purge_thread),
337
338=== modified file 'innodb_purge_thread.patch'
339--- innodb_purge_thread.patch 2011-02-02 14:49:16 +0000
340+++ innodb_purge_thread.patch 2011-02-08 02:15:10 +0000
341@@ -8,7 +8,7 @@
342 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
343 --- a/storage/innodb_plugin/handler/ha_innodb.cc 2010-08-27 16:23:31.022060427 +0900
344 +++ b/storage/innodb_plugin/handler/ha_innodb.cc 2010-08-27 16:25:49.004020662 +0900
345-@@ -10974,6 +10974,11 @@
346+@@ -10979,6 +10979,11 @@
347 "Output statistics of recovery process after it.",
348 NULL, NULL, FALSE);
349
350@@ -20,7 +20,7 @@
351 static MYSQL_SYSVAR_BOOL(overwrite_relay_log_info, innobase_overwrite_relay_log_info,
352 PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
353 "During InnoDB crash recovery on slave overwrite relay-log.info "
354-@@ -11497,6 +11502,7 @@
355+@@ -11502,6 +11507,7 @@
356 #endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
357 MYSQL_SYSVAR(read_ahead_threshold),
358 MYSQL_SYSVAR(io_capacity),
359
360=== modified file 'innodb_recovery_patches.patch'
361--- innodb_recovery_patches.patch 2010-12-16 11:35:26 +0000
362+++ innodb_recovery_patches.patch 2011-02-08 02:15:10 +0000
363@@ -127,7 +127,7 @@
364 srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
365 srv_use_checksums = (ibool) innobase_use_checksums;
366
367-@@ -10960,6 +10964,16 @@
368+@@ -10965,6 +10969,16 @@
369 "don't use the datafile for normal mysqld or ibbackup! ####",
370 NULL, NULL, FALSE);
371
372@@ -144,7 +144,7 @@
373 static MYSQL_SYSVAR_BOOL(overwrite_relay_log_info, innobase_overwrite_relay_log_info,
374 PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
375 "During InnoDB crash recovery on slave overwrite relay-log.info "
376-@@ -11412,6 +11426,8 @@
377+@@ -11417,6 +11431,8 @@
378 MYSQL_SYSVAR(data_home_dir),
379 MYSQL_SYSVAR(doublewrite),
380 MYSQL_SYSVAR(extra_undoslots),
381
382=== modified file 'innodb_separate_doublewrite.patch'
383--- innodb_separate_doublewrite.patch 2011-02-02 14:49:16 +0000
384+++ innodb_separate_doublewrite.patch 2011-02-08 02:15:10 +0000
385@@ -357,7 +357,7 @@
386 srv_extra_undoslots = (ibool) innobase_extra_undoslots;
387
388 srv_use_sys_stats_table = (ibool) innobase_use_sys_stats_table;
389-@@ -11321,6 +11324,11 @@
390+@@ -11326,6 +11329,11 @@
391 "Path to individual files and their sizes.",
392 NULL, NULL, NULL);
393
394@@ -369,7 +369,7 @@
395 static MYSQL_SYSVAR_LONG(autoinc_lock_mode, innobase_autoinc_lock_mode,
396 PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
397 "The AUTOINC lock modes supported by InnoDB: "
398-@@ -11487,6 +11495,7 @@
399+@@ -11492,6 +11500,7 @@
400 MYSQL_SYSVAR(commit_concurrency),
401 MYSQL_SYSVAR(concurrency_tickets),
402 MYSQL_SYSVAR(data_file_path),
403
404=== modified file 'innodb_show_lock_name.patch'
405--- innodb_show_lock_name.patch 2011-02-02 14:49:16 +0000
406+++ innodb_show_lock_name.patch 2011-02-08 02:15:10 +0000
407@@ -8,7 +8,7 @@
408 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
409 --- a/storage/innodb_plugin/handler/ha_innodb.cc 2010-08-27 16:29:12.539982446 +0900
410 +++ b/storage/innodb_plugin/handler/ha_innodb.cc 2010-08-27 16:29:24.322059309 +0900
411-@@ -9233,8 +9233,8 @@
412+@@ -9238,8 +9238,8 @@
413 rw_lock_wait_time += mutex->lspent_time;
414 }
415 #else /* UNIV_DEBUG */
416@@ -19,7 +19,7 @@
417 buf2len= (uint) my_snprintf(buf2, sizeof(buf2), "os_waits=%lu",
418 (ulong) mutex->count_os_wait);
419
420-@@ -9249,9 +9249,8 @@
421+@@ -9254,9 +9254,8 @@
422
423 if (block_mutex) {
424 buf1len = (uint) my_snprintf(buf1, sizeof buf1,
425@@ -31,7 +31,7 @@
426 buf2len = (uint) my_snprintf(buf2, sizeof buf2,
427 "os_waits=%lu",
428 (ulong) block_mutex_oswait_count);
429-@@ -9280,8 +9279,8 @@
430+@@ -9285,8 +9284,8 @@
431 continue;
432 }
433
434@@ -42,7 +42,7 @@
435 buf2len = my_snprintf(buf2, sizeof buf2, "os_waits=%lu",
436 (ulong) lock->count_os_wait);
437
438-@@ -9295,9 +9294,8 @@
439+@@ -9300,9 +9299,8 @@
440
441 if (block_lock) {
442 buf1len = (uint) my_snprintf(buf1, sizeof buf1,
443
444=== modified file 'innodb_show_sys_tables.patch'
445--- innodb_show_sys_tables.patch 2010-12-16 11:35:26 +0000
446+++ innodb_show_sys_tables.patch 2011-02-08 02:15:10 +0000
447@@ -8,7 +8,7 @@
448 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
449 --- a/storage/innodb_plugin/handler/ha_innodb.cc 2010-08-27 16:45:46.194411503 +0900
450 +++ b/storage/innodb_plugin/handler/ha_innodb.cc 2010-08-27 16:49:26.171990559 +0900
451-@@ -11793,6 +11793,9 @@
452+@@ -11798,6 +11798,9 @@
453 i_s_innodb_table_stats,
454 i_s_innodb_index_stats,
455 i_s_innodb_admin_command,
456
457=== modified file 'innodb_stats.patch'
458--- innodb_stats.patch 2011-02-02 14:49:16 +0000
459+++ innodb_stats.patch 2011-02-08 02:15:10 +0000
460@@ -1128,7 +1128,19 @@
461 innodb_srv_conc_exit_innodb(trx);
462
463 error = convert_error_code_to_mysql(
464-@@ -5897,6 +5912,11 @@
465+@@ -5688,6 +5703,11 @@
466+ case DB_SUCCESS:
467+ error = 0;
468+ table->status = 0;
469++#ifdef EXTENDED_FOR_USERSTAT
470++ rows_read++;
471++ if (active_index < MAX_KEY)
472++ index_rows_read[active_index]++;
473++#endif
474+ break;
475+ case DB_RECORD_NOT_FOUND:
476+ error = HA_ERR_KEY_NOT_FOUND;
477+@@ -5897,6 +5917,11 @@
478 case DB_SUCCESS:
479 error = 0;
480 table->status = 0;
481@@ -1140,7 +1152,7 @@
482 break;
483 case DB_RECORD_NOT_FOUND:
484 error = HA_ERR_END_OF_FILE;
485-@@ -7783,11 +7803,31 @@
486+@@ -7783,11 +7808,31 @@
487 /* In sql_show we call with this flag: update
488 then statistics so that they are up-to-date */
489
490@@ -1173,7 +1185,7 @@
491
492 prebuilt->trx->op_info = "returning various info to MySQL";
493 }
494-@@ -7865,7 +7905,7 @@
495+@@ -7865,7 +7910,7 @@
496 are asked by MySQL to avoid locking. Another reason to
497 avoid the call is that it uses quite a lot of CPU.
498 See Bug#38185. */
499@@ -1182,7 +1194,7 @@
500 /* We do not update delete_length if no
501 locking is requested so the "old" value can
502 remain. delete_length is initialized to 0 in
503-@@ -11045,6 +11085,45 @@
504+@@ -11045,6 +11090,45 @@
505 "The number of index pages to sample when calculating statistics (default 8)",
506 NULL, NULL, 8, 1, ~0ULL, 0);
507
508@@ -1228,7 +1240,7 @@
509 static MYSQL_SYSVAR_BOOL(adaptive_hash_index, btr_search_enabled,
510 PLUGIN_VAR_OPCMDARG,
511 "Enable InnoDB adaptive hash index (enabled by default). "
512-@@ -11363,6 +11442,10 @@
513+@@ -11363,6 +11447,10 @@
514 MYSQL_SYSVAR(overwrite_relay_log_info),
515 MYSQL_SYSVAR(rollback_on_timeout),
516 MYSQL_SYSVAR(stats_on_metadata),
517@@ -1239,7 +1251,7 @@
518 MYSQL_SYSVAR(stats_sample_pages),
519 MYSQL_SYSVAR(adaptive_hash_index),
520 MYSQL_SYSVAR(replication_delay),
521-@@ -11427,6 +11510,8 @@
522+@@ -11427,6 +11515,8 @@
523 i_s_innodb_cmp_reset,
524 i_s_innodb_cmpmem,
525 i_s_innodb_cmpmem_reset,

Subscribers

People subscribed via source and target branches

to all changes: