Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~percona-dev/percona-server/release-5.1.51-12-expand_import_fix4autoinc into lp:~percona-dev/percona-server/release-5.1.51-12

  1. release-5.1.51-12-expand_import_fix4autoinc
  2. Merge into release-5.1.51-12
Proposed by Yasufumi Kinoshita
Status: Merged
Approved by: Vadim Tkachenko
Approved revision: 129
Merge reported by: Yasufumi Kinoshita
Merged at revision: not available
Proposed branch: lp:~percona-dev/percona-server/release-5.1.51-12-expand_import_fix4autoinc
Merge into: lp:~percona-dev/percona-server/release-5.1.51-12
Diff against target: 456 lines (+57/-42)
16 files modified
innodb_adjust_defaults.patch (+4/-4)
innodb_admin_command_base.patch (+1/-1)
innodb_buffer_pool_shm.patch (+2/-2)
innodb_expand_import.patch (+17/-2)
innodb_extend_slow.patch (+1/-1)
innodb_fast_checksum.patch (+2/-2)
innodb_files_extend.patch (+2/-2)
innodb_fix_misc.patch (+1/-1)
innodb_lru_dump_restore.patch (+2/-2)
innodb_pass_corrupt_table.patch (+9/-9)
innodb_purge_thread.patch (+2/-2)
innodb_recovery_patches.patch (+2/-2)
innodb_separate_doublewrite.patch (+2/-2)
innodb_show_lock_name.patch (+4/-4)
innodb_show_sys_tables.patch (+1/-1)
innodb_stats.patch (+5/-5)
To merge this branch: bzr merge lp:~percona-dev/percona-server/release-5.1.51-12-expand_import_fix4autoinc
Reviewer Review Type Date Requested Status
Vadim Tkachenko Approve
Fred Linhoss (community) documentation Approve
Review via email: mp+38175@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Fred Linhoss (fred-linhoss) wrote :

Added to RN for next 11 and 12 releases.

review: Approve (documentation)
Revision history for this message
Vadim Tkachenko (vadim-tk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'innodb_adjust_defaults.patch'
2--- innodb_adjust_defaults.patch 2010-10-04 11:53:08 +0000
3+++ innodb_adjust_defaults.patch 2010-10-12 02:30:54 +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-@@ -11167,7 +11167,7 @@
9+@@ -11175,7 +11175,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-@@ -11267,7 +11267,7 @@
18+@@ -11275,7 +11275,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-@@ -11505,7 +11505,7 @@
27+@@ -11513,7 +11513,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-@@ -11583,8 +11583,8 @@
36+@@ -11591,8 +11591,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-10-04 11:53:08 +0000
43+++ innodb_admin_command_base.patch 2010-10-12 02:30:54 +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-@@ -11511,6 +11511,7 @@
49+@@ -11519,6 +11519,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-10-04 11:53:08 +0000
56+++ innodb_buffer_pool_shm.patch 2010-10-12 02:30:54 +0000
57@@ -683,7 +683,7 @@
58
59 #ifdef HAVE_LARGE_PAGES
60 if ((os_use_large_pages = (ibool) my_use_large_pages))
61-@@ -11362,6 +11364,16 @@
62+@@ -11370,6 +11372,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-@@ -11627,6 +11639,8 @@
71+@@ -11635,6 +11647,8 @@
72 MYSQL_SYSVAR(additional_mem_pool_size),
73 MYSQL_SYSVAR(autoextend_increment),
74 MYSQL_SYSVAR(buffer_pool_size),
75
76=== modified file 'innodb_expand_import.patch'
77--- innodb_expand_import.patch 2010-10-04 11:53:08 +0000
78+++ innodb_expand_import.patch 2010-10-12 02:30:54 +0000
79@@ -498,7 +498,22 @@
80 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
81 --- a/storage/innodb_plugin/handler/ha_innodb.cc 2010-04-29 16:54:08.000000000 +0900
82 +++ b/storage/innodb_plugin/handler/ha_innodb.cc 2010-04-30 10:28:05.000000000 +0900
83-@@ -11284,6 +11284,11 @@
84+@@ -7109,6 +7109,14 @@
85+ err = row_discard_tablespace_for_mysql(dict_table->name, trx);
86+ } else {
87+ err = row_import_tablespace_for_mysql(dict_table->name, trx);
88++
89++ /* in expanded import mode re-initialize auto_increment again */
90++ if ((err == DB_SUCCESS) && srv_expand_import &&
91++ (table->found_next_number_field != NULL)) {
92++ dict_table_autoinc_lock(dict_table);
93++ innobase_initialize_autoinc();
94++ dict_table_autoinc_unlock(dict_table);
95++ }
96+ }
97+
98+ err = convert_error_code_to_mysql(err, dict_table->flags, NULL);
99+@@ -11284,6 +11292,11 @@
100 "Enable/Disable unsafe group commit when support_xa=OFF and use with binlog or other XA storage engine.",
101 NULL, NULL, 0, 0, 1, 0);
102
103@@ -510,7 +525,7 @@
104 static MYSQL_SYSVAR_ULONG(extra_rsegments, srv_extra_rsegments,
105 PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
106 "Number of extra user rollback segments when create new database.",
107-@@ -11360,6 +11365,7 @@
108+@@ -11360,6 +11373,7 @@
109 MYSQL_SYSVAR(adaptive_checkpoint),
110 MYSQL_SYSVAR(flush_log_at_trx_commit_session),
111 MYSQL_SYSVAR(enable_unsafe_group_commit),
112
113=== modified file 'innodb_extend_slow.patch'
114--- innodb_extend_slow.patch 2010-10-04 11:53:08 +0000
115+++ innodb_extend_slow.patch 2010-10-12 02:30:54 +0000
116@@ -428,7 +428,7 @@
117 /*********************************************************************//**
118 Construct ha_innobase handler. */
119 UNIV_INTERN
120-@@ -8930,6 +8966,25 @@
121+@@ -8938,6 +8974,25 @@
122 statement has ended */
123
124 if (trx->n_mysql_tables_in_use == 0) {
125
126=== modified file 'innodb_fast_checksum.patch'
127--- innodb_fast_checksum.patch 2010-10-04 11:53:08 +0000
128+++ innodb_fast_checksum.patch 2010-10-12 02:30:54 +0000
129@@ -178,7 +178,7 @@
130
131 #ifdef HAVE_LARGE_PAGES
132 if ((os_use_large_pages = (ibool) my_use_large_pages))
133-@@ -11094,6 +11096,15 @@
134+@@ -11102,6 +11104,15 @@
135 "Disable with --skip-innodb-checksums.",
136 NULL, NULL, TRUE);
137
138@@ -194,7 +194,7 @@
139 static MYSQL_SYSVAR_STR(data_home_dir, innobase_data_home_dir,
140 PLUGIN_VAR_READONLY,
141 "The common part for InnoDB table spaces.",
142-@@ -11577,6 +11588,7 @@
143+@@ -11585,6 +11596,7 @@
144 MYSQL_SYSVAR(autoextend_increment),
145 MYSQL_SYSVAR(buffer_pool_size),
146 MYSQL_SYSVAR(checksums),
147
148=== modified file 'innodb_files_extend.patch'
149--- innodb_files_extend.patch 2010-10-04 11:53:08 +0000
150+++ innodb_files_extend.patch 2010-10-12 02:30:54 +0000
151@@ -138,7 +138,7 @@
152 }
153 }
154
155-@@ -11105,6 +11137,11 @@
156+@@ -11113,6 +11145,11 @@
157 "#### Attention: The checksum is not compatible for normal or disabled version! ####",
158 NULL, NULL, FALSE);
159
160@@ -150,7 +150,7 @@
161 static MYSQL_SYSVAR_STR(data_home_dir, innobase_data_home_dir,
162 PLUGIN_VAR_READONLY,
163 "The common part for InnoDB table spaces.",
164-@@ -11584,6 +11621,7 @@
165+@@ -11592,6 +11629,7 @@
166 NULL, NULL, 0, 0, 1, 0);
167
168 static struct st_mysql_sys_var* innobase_system_variables[]= {
169
170=== modified file 'innodb_fix_misc.patch'
171--- innodb_fix_misc.patch 2010-10-04 11:53:08 +0000
172+++ innodb_fix_misc.patch 2010-10-12 02:30:54 +0000
173@@ -70,7 +70,7 @@
174 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
175 --- a/storage/innodb_plugin/handler/ha_innodb.cc 2010-08-27 16:50:59.626327847 +0900
176 +++ b/storage/innodb_plugin/handler/ha_innodb.cc 2010-08-27 16:55:20.281021252 +0900
177-@@ -11714,7 +11714,7 @@
178+@@ -11722,7 +11722,7 @@
179 &innobase_storage_engine,
180 innobase_hton_name,
181 "Innobase Oy",
182
183=== modified file 'innodb_lru_dump_restore.patch'
184--- innodb_lru_dump_restore.patch 2010-10-04 11:53:08 +0000
185+++ innodb_lru_dump_restore.patch 2010-10-12 02:30:54 +0000
186@@ -384,7 +384,7 @@
187 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
188 --- a/storage/innodb_plugin/handler/ha_innodb.cc 2010-10-01 09:57:56.486228425 +0900
189 +++ b/storage/innodb_plugin/handler/ha_innodb.cc 2010-10-01 10:00:13.292228546 +0900
190-@@ -11453,6 +11453,12 @@
191+@@ -11461,6 +11461,12 @@
192 "Limit the allocated memory for dictionary cache. (0: unlimited)",
193 NULL, NULL, 0, 0, LONG_MAX, 0);
194
195@@ -397,7 +397,7 @@
196 static struct st_mysql_sys_var* innobase_system_variables[]= {
197 MYSQL_SYSVAR(additional_mem_pool_size),
198 MYSQL_SYSVAR(autoextend_increment),
199-@@ -11532,6 +11538,7 @@
200+@@ -11540,6 +11546,7 @@
201 MYSQL_SYSVAR(change_buffering),
202 MYSQL_SYSVAR(read_ahead_threshold),
203 MYSQL_SYSVAR(io_capacity),
204
205=== modified file 'innodb_pass_corrupt_table.patch'
206--- innodb_pass_corrupt_table.patch 2010-10-04 11:53:08 +0000
207+++ innodb_pass_corrupt_table.patch 2010-10-12 02:30:54 +0000
208@@ -932,7 +932,7 @@
209 switch (ret) {
210 case DB_SUCCESS:
211 error = 0;
212-@@ -7204,6 +7267,10 @@
213+@@ -7212,6 +7275,10 @@
214 DBUG_RETURN(my_errno=HA_ERR_WRONG_COMMAND);
215 }
216
217@@ -943,7 +943,7 @@
218 /* Truncate the table in InnoDB */
219
220 error = row_truncate_table_for_mysql(prebuilt->table, prebuilt->trx);
221-@@ -7212,6 +7279,10 @@
222+@@ -7220,6 +7287,10 @@
223 goto fallback;
224 }
225
226@@ -954,7 +954,7 @@
227 error = convert_error_code_to_mysql(error, prebuilt->table->flags,
228 NULL);
229
230-@@ -7722,6 +7793,16 @@
231+@@ -7730,6 +7801,16 @@
232 return(ranges + (double) rows / (double) total_rows * time_for_scan);
233 }
234
235@@ -971,7 +971,7 @@
236 /*********************************************************************//**
237 Calculates the key number used inside MySQL for an Innobase index. We will
238 first check the "index translation table" for a match of the index to get
239-@@ -7840,9 +7921,9 @@
240+@@ -7848,9 +7929,9 @@
241 ib_table = prebuilt->table;
242
243 if (flag & HA_STATUS_TIME) {
244@@ -984,7 +984,7 @@
245 /* In sql_show we call with this flag: update
246 then statistics so that they are up-to-date */
247
248-@@ -8122,9 +8203,17 @@
249+@@ -8130,9 +8211,17 @@
250 THD* thd, /*!< in: connection thread handle */
251 HA_CHECK_OPT* check_opt) /*!< in: currently ignored */
252 {
253@@ -1002,7 +1002,7 @@
254 return(0);
255 }
256
257-@@ -8306,6 +8395,10 @@
258+@@ -8314,6 +8403,10 @@
259 my_error(ER_QUERY_INTERRUPTED, MYF(0));
260 }
261
262@@ -1013,7 +1013,7 @@
263 DBUG_RETURN(is_ok ? HA_ADMIN_OK : HA_ADMIN_CORRUPT);
264 }
265
266-@@ -9033,6 +9126,10 @@
267+@@ -9041,6 +9134,10 @@
268
269 update_thd(thd);
270
271@@ -1024,7 +1024,7 @@
272 if (prebuilt->table->ibd_file_missing && !thd_tablespace_op(thd)) {
273 ut_print_timestamp(stderr);
274 fprintf(stderr,
275-@@ -11467,6 +11564,14 @@
276+@@ -11475,6 +11572,14 @@
277 "0 (the default) disables automatic dumps.",
278 NULL, NULL, 0, 0, UINT_MAX32, 0);
279
280@@ -1039,7 +1039,7 @@
281 static struct st_mysql_sys_var* innobase_system_variables[]= {
282 MYSQL_SYSVAR(additional_mem_pool_size),
283 MYSQL_SYSVAR(autoextend_increment),
284-@@ -11549,6 +11654,7 @@
285+@@ -11557,6 +11662,7 @@
286 MYSQL_SYSVAR(io_capacity),
287 MYSQL_SYSVAR(auto_lru_dump),
288 MYSQL_SYSVAR(use_purge_thread),
289
290=== modified file 'innodb_purge_thread.patch'
291--- innodb_purge_thread.patch 2010-10-04 11:53:08 +0000
292+++ innodb_purge_thread.patch 2010-10-12 02:30:54 +0000
293@@ -8,7 +8,7 @@
294 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
295 --- a/storage/innodb_plugin/handler/ha_innodb.cc 2010-08-27 16:23:31.022060427 +0900
296 +++ b/storage/innodb_plugin/handler/ha_innodb.cc 2010-08-27 16:25:49.004020662 +0900
297-@@ -10963,6 +10963,11 @@
298+@@ -10971,6 +10971,11 @@
299 "Output statistics of recovery process after it.",
300 NULL, NULL, FALSE);
301
302@@ -20,7 +20,7 @@
303 static MYSQL_SYSVAR_BOOL(overwrite_relay_log_info, innobase_overwrite_relay_log_info,
304 PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
305 "During InnoDB crash recovery on slave overwrite relay-log.info "
306-@@ -11474,6 +11479,7 @@
307+@@ -11482,6 +11487,7 @@
308 MYSQL_SYSVAR(change_buffering),
309 MYSQL_SYSVAR(read_ahead_threshold),
310 MYSQL_SYSVAR(io_capacity),
311
312=== modified file 'innodb_recovery_patches.patch'
313--- innodb_recovery_patches.patch 2010-10-04 11:53:08 +0000
314+++ innodb_recovery_patches.patch 2010-10-12 02:30:54 +0000
315@@ -127,7 +127,7 @@
316 srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
317 srv_use_checksums = (ibool) innobase_use_checksums;
318
319-@@ -10949,6 +10953,16 @@
320+@@ -10957,6 +10961,16 @@
321 "don't use the datafile for normal mysqld or ibbackup! ####",
322 NULL, NULL, FALSE);
323
324@@ -144,7 +144,7 @@
325 static MYSQL_SYSVAR_BOOL(overwrite_relay_log_info, innobase_overwrite_relay_log_info,
326 PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
327 "During InnoDB crash recovery on slave overwrite relay-log.info "
328-@@ -11392,6 +11406,8 @@
329+@@ -11400,6 +11414,8 @@
330 MYSQL_SYSVAR(data_home_dir),
331 MYSQL_SYSVAR(doublewrite),
332 MYSQL_SYSVAR(extra_undoslots),
333
334=== modified file 'innodb_separate_doublewrite.patch'
335--- innodb_separate_doublewrite.patch 2010-10-04 11:53:08 +0000
336+++ innodb_separate_doublewrite.patch 2010-10-12 02:30:54 +0000
337@@ -267,7 +267,7 @@
338 srv_extra_undoslots = (ibool) innobase_extra_undoslots;
339
340 srv_use_sys_stats_table = (ibool) innobase_use_sys_stats_table;
341-@@ -11310,6 +11313,11 @@
342+@@ -11318,6 +11321,11 @@
343 "Path to individual files and their sizes.",
344 NULL, NULL, NULL);
345
346@@ -279,7 +279,7 @@
347 static MYSQL_SYSVAR_LONG(autoinc_lock_mode, innobase_autoinc_lock_mode,
348 PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
349 "The AUTOINC lock modes supported by InnoDB: "
350-@@ -11467,6 +11475,7 @@
351+@@ -11475,6 +11483,7 @@
352 MYSQL_SYSVAR(commit_concurrency),
353 MYSQL_SYSVAR(concurrency_tickets),
354 MYSQL_SYSVAR(data_file_path),
355
356=== modified file 'innodb_show_lock_name.patch'
357--- innodb_show_lock_name.patch 2010-10-04 11:53:08 +0000
358+++ innodb_show_lock_name.patch 2010-10-12 02:30:54 +0000
359@@ -8,7 +8,7 @@
360 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
361 --- a/storage/innodb_plugin/handler/ha_innodb.cc 2010-08-27 16:29:12.539982446 +0900
362 +++ b/storage/innodb_plugin/handler/ha_innodb.cc 2010-08-27 16:29:24.322059309 +0900
363-@@ -9226,8 +9226,8 @@
364+@@ -9234,8 +9234,8 @@
365 rw_lock_wait_time += mutex->lspent_time;
366 }
367 #else /* UNIV_DEBUG */
368@@ -19,7 +19,7 @@
369 buf2len= (uint) my_snprintf(buf2, sizeof(buf2), "os_waits=%lu",
370 (ulong) mutex->count_os_wait);
371
372-@@ -9242,9 +9242,8 @@
373+@@ -9250,9 +9250,8 @@
374
375 if (block_mutex) {
376 buf1len = (uint) my_snprintf(buf1, sizeof buf1,
377@@ -31,7 +31,7 @@
378 buf2len = (uint) my_snprintf(buf2, sizeof buf2,
379 "os_waits=%lu",
380 (ulong) block_mutex_oswait_count);
381-@@ -9273,8 +9272,8 @@
382+@@ -9281,8 +9280,8 @@
383 continue;
384 }
385
386@@ -42,7 +42,7 @@
387 buf2len = my_snprintf(buf2, sizeof buf2, "os_waits=%lu",
388 (ulong) lock->count_os_wait);
389
390-@@ -9288,9 +9287,8 @@
391+@@ -9296,9 +9295,8 @@
392
393 if (block_lock) {
394 buf1len = (uint) my_snprintf(buf1, sizeof buf1,
395
396=== modified file 'innodb_show_sys_tables.patch'
397--- innodb_show_sys_tables.patch 2010-10-04 11:53:08 +0000
398+++ innodb_show_sys_tables.patch 2010-10-12 02:30:54 +0000
399@@ -8,7 +8,7 @@
400 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
401 --- a/storage/innodb_plugin/handler/ha_innodb.cc 2010-08-27 16:45:46.194411503 +0900
402 +++ b/storage/innodb_plugin/handler/ha_innodb.cc 2010-08-27 16:49:26.171990559 +0900
403-@@ -11737,6 +11737,9 @@
404+@@ -11745,6 +11745,9 @@
405 i_s_innodb_table_stats,
406 i_s_innodb_index_stats,
407 i_s_innodb_admin_command,
408
409=== modified file 'innodb_stats.patch'
410--- innodb_stats.patch 2010-10-04 11:53:08 +0000
411+++ innodb_stats.patch 2010-10-12 02:30:54 +0000
412@@ -1157,7 +1157,7 @@
413 break;
414 case DB_RECORD_NOT_FOUND:
415 error = HA_ERR_END_OF_FILE;
416-@@ -7777,13 +7797,36 @@
417+@@ -7785,13 +7805,36 @@
418 ib_table = prebuilt->table;
419
420 if (flag & HA_STATUS_TIME) {
421@@ -1196,7 +1196,7 @@
422
423 prebuilt->trx->op_info = "returning various info to MySQL";
424 }
425-@@ -7856,7 +7899,7 @@
426+@@ -7864,7 +7907,7 @@
427 are asked by MySQL to avoid locking. Another reason to
428 avoid the call is that it uses quite a lot of CPU.
429 See Bug#38185. */
430@@ -1205,7 +1205,7 @@
431 /* We do not update delete_length if no
432 locking is requested so the "old" value can
433 remain. delete_length is initialized to 0 in
434-@@ -11031,6 +11074,45 @@
435+@@ -11039,6 +11082,45 @@
436 "The number of index pages to sample when calculating statistics (default 8)",
437 NULL, NULL, 8, 1, ~0ULL, 0);
438
439@@ -1251,7 +1251,7 @@
440 static MYSQL_SYSVAR_BOOL(adaptive_hash_index, btr_search_enabled,
441 PLUGIN_VAR_OPCMDARG,
442 "Enable InnoDB adaptive hash index (enabled by default). "
443-@@ -11340,6 +11422,10 @@
444+@@ -11348,6 +11430,10 @@
445 MYSQL_SYSVAR(overwrite_relay_log_info),
446 MYSQL_SYSVAR(rollback_on_timeout),
447 MYSQL_SYSVAR(stats_on_metadata),
448@@ -1262,7 +1262,7 @@
449 MYSQL_SYSVAR(stats_sample_pages),
450 MYSQL_SYSVAR(adaptive_hash_index),
451 MYSQL_SYSVAR(replication_delay),
452-@@ -11401,6 +11487,8 @@
453+@@ -11409,6 +11495,8 @@
454 i_s_innodb_cmp_reset,
455 i_s_innodb_cmpmem,
456 i_s_innodb_cmpmem_reset,

Subscribers

People subscribed via source and target branches

to all changes: