WL#10322: Deprecate innodb_undo_logs in 5.7

* Add (deprecated) to innodb-undo-logs description and mention that it
is actually setting the number of rollback segments.
* Delete “(deprecated)” from innodb-rollback-segments message.
* Add a deprecation warning message when innodb_undo_logs is used
at runtime and also at startup in a config or the command line.
* Return a warning when innodb_undo_logs is used at runtime.
* Rename srv_undo_logs to srv_rollback_segments in code
* Rename innodb_undo_logs to innodb_rollback_segments in all collections
and testcases except sysvars.innodb_undo_logs_basic.
* Fix sysvars.innodb_undo_logs_basic to suppress the deprecation warning.
Add a restart to exercise the deprecation code for using it at startup.

Approved by Satya in RB#15389

mysql-test/collections/default.daily

@@ -37,7 +37,7 @@ perl mysql-test-run.pl --force --timer  --parallel=auto --experimental=collectio
 perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60  --parallel=auto --comment=n_mix_4k_size --vardir=var-n_mix_4k --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-test-list=collections/disabled-daily.list --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin --suite=innodb
 perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60  --parallel=auto --comment=n_mix_8k_size --vardir=var-n_mix_8k --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-test-list=collections/disabled-daily.list --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin --suite=innodb
 perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60  --parallel=auto --comment=innodb_undo --vardir=var-innodb-undo --experimental=collections/default.experimental --suite=innodb_undo --mysqld=--innodb_undo_tablespaces=2 --bootstrap --innodb_undo_tablespaces=2 --skip-test-list=collections/disabled-per-push.list
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=innodb_undo --vardir=var-innodb-undo --experimental=collections/default.experimental --suite=innodb_undo --mysqld=--innodb_undo_tablespaces=3 --mysqld=--innodb_page_size=64K --bootstrap --innodb_undo_tablespaces=3 --bootstrap --innodb_page_size=64K --bootstrap --innodb_undo_logs=35 --skip-test-list=collections/disabled-per-push.list --big-test noop
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=innodb_undo --vardir=var-innodb-undo --experimental=collections/default.experimental --suite=innodb_undo --mysqld=--innodb_undo_tablespaces=3 --mysqld=--innodb_page_size=64K --bootstrap --innodb_undo_tablespaces=3 --bootstrap --innodb_page_size=64K --bootstrap --innodb_rollback_segments=35 --skip-test-list=collections/disabled-per-push.list --big-test noop
 
 # Engine independent tests
 perl mysql-test-run.pl --timer --force  --parallel=auto --comment=eits-rpl-binlog-row-tests-myisam-engine --experimental=collections/default.experimental --vardir=var-binlog-row-eits-tests-myisam-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=myisam --do-test=rpl --mysqld=--binlog-format=row --skip-test-list=collections/disabled-daily.list

mysql-test/collections/mysql-5.7-stage.push

@@ -17,7 +17,7 @@ perl mysql-test-run.pl --timer  --force --parallel=auto --comment=innodb_4k_size
 
 # Run with innodb_undo_tablespace > 1
 perl mysql-test-run.pl --timer  --force --parallel=auto --comment=innodb_undo --vardir=var-innodb-undo --experimental=collections/default.experimental --suite=innodb_undo --mysqld=--innodb_undo_tablespaces=2 --bootstrap --innodb_undo_tablespaces=2 --skip-test-list=collections/disabled-per-push.list
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=innodb_undo --vardir=var-innodb-undo --experimental=collections/default.experimental --suite=innodb_undo --mysqld=--innodb_undo_tablespaces=3 --mysqld=--innodb_page_size=64K --bootstrap --innodb_undo_tablespaces=3 --bootstrap --innodb_page_size=64K --bootstrap --innodb_undo_logs=35 --skip-test-list=collections/disabled-per-push.list --big-test noop
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=innodb_undo --vardir=var-innodb-undo --experimental=collections/default.experimental --suite=innodb_undo --mysqld=--innodb_undo_tablespaces=3 --mysqld=--innodb_page_size=64K --bootstrap --innodb_undo_tablespaces=3 --bootstrap --innodb_page_size=64K --bootstrap --innodb_rollback_segments=35 --skip-test-list=collections/disabled-per-push.list --big-test noop
 
 # Additional modes for rpl. Multi-Threaded Slave
 perl mysql-test-run.pl --timer  --force --parallel=auto --comment=rpl_binlog_n_mix_MTS --vardir=var-mts-rpl-binlog-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --mysqld=--slave-parallel-workers=4 --suite=rpl

mysql-test/collections/mysql-trunk-stage.push

@@ -17,7 +17,7 @@ perl mysql-test-run.pl --timer  --force --parallel=auto --comment=innodb_4k_size
 
 # Run with innodb_undo_tablespace > 1
 perl mysql-test-run.pl --timer  --force --parallel=auto --comment=innodb_undo --vardir=var-innodb-undo --experimental=collections/default.experimental --suite=innodb_undo --mysqld=--innodb_undo_tablespaces=2 --bootstrap --innodb_undo_tablespaces=2 --skip-test-list=collections/disabled-per-push.list
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=innodb_undo --vardir=var-innodb-undo --experimental=collections/default.experimental --suite=innodb_undo --mysqld=--innodb_undo_tablespaces=3 --mysqld=--innodb_page_size=64K --bootstrap --innodb_undo_tablespaces=3 --bootstrap --innodb_page_size=64K --bootstrap --innodb_undo_logs=35 --skip-test-list=collections/disabled-per-push.list --big-test noop
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=innodb_undo --vardir=var-innodb-undo --experimental=collections/default.experimental --suite=innodb_undo --mysqld=--innodb_undo_tablespaces=3 --mysqld=--innodb_page_size=64K --bootstrap --innodb_undo_tablespaces=3 --bootstrap --innodb_page_size=64K --bootstrap --innodb_rollback_segments=35 --skip-test-list=collections/disabled-per-push.list --big-test noop
 
 # Additional modes for rpl. Multi-Threaded Slave
 perl mysql-test-run.pl --timer  --force --parallel=auto --comment=rpl_binlog_n_mix_MTS --vardir=var-mts-rpl-binlog-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --mysqld=--slave-parallel-workers=4 --suite=rpl

mysql-test/suite/innodb/r/innodb_bug12400341.result

@@ -1,6 +1,5 @@
-call mtr.add_suppression("\\[Warning\\] InnoDB: Cannot find a free slot for an undo log. Do you have too");
-set @old_innodb_undo_logs = @@innodb_undo_logs;
-set global innodb_undo_logs=1;
+set @old_innodb_rollback_segments = @@innodb_rollback_segments;
+set global innodb_rollback_segments=1;
 show variables like "max_connections";
 Variable_name	Value
 max_connections	64
@@ -25,4 +24,4 @@ select count(*) from information_schema.processlist;
 count(*)
 33
 drop database mysqltest;
-set global innodb_undo_logs = @old_innodb_undo_logs;
+set global innodb_rollback_segments = @old_innodb_rollback_segments;

mysql-test/suite/innodb/r/innodb_wl6915_debug.result

@@ -58,7 +58,7 @@ count(*)
 50
 drop table t2;
 drop procedure populate_t1_t2;
-# restart: --innodb_undo_logs=1
+# restart: --innodb_rollback_segments=1
 create table t (i int) engine=innodb;
 insert into t values (1);
 insert into t values (2);
@@ -95,7 +95,7 @@ count(*)
 drop table t1;
 drop table t2;
 drop procedure populate_t1_t2;
-# restart: --innodb_undo_logs=10
+# restart: --innodb_rollback_segments=10
 create table t (i int) engine=innodb;
 insert into t values (1);
 insert into t values (2);
@@ -104,7 +104,7 @@ insert into t values (1);
 insert into t values (2);
 drop table t;
 drop table t2;
-# restart: --innodb_undo_logs=40
+# restart: --innodb_rollback_segments=40
 create table t (i int) engine=innodb;
 insert into t values (1);
 insert into t values (2);

mysql-test/suite/innodb/t/innodb_bug12400341.test

@@ -13,15 +13,15 @@ if (`select count(*)=0 from information_schema.global_variables where variable_n
 # and cause unstable result.
 --source include/not_valgrind.inc
 
+--disable_query_log
 call mtr.add_suppression("\\[Warning\\] InnoDB: Cannot find a free slot for an undo log. Do you have too");
 
---disable_query_log
 set @old_innodb_trx_rseg_n_slots_debug = @@innodb_trx_rseg_n_slots_debug;
 set global innodb_trx_rseg_n_slots_debug = 32;
 --enable_query_log
 
-set @old_innodb_undo_logs = @@innodb_undo_logs;
-set global innodb_undo_logs=1;
+set @old_innodb_rollback_segments = @@innodb_rollback_segments;
+set global innodb_rollback_segments=1;
 
 show variables like "max_connections";
 show variables like "innodb_thread_concurrency";
@@ -107,7 +107,7 @@ while ($c)
 #
 drop database mysqltest;
 
-set global innodb_undo_logs = @old_innodb_undo_logs;
+set global innodb_rollback_segments = @old_innodb_rollback_segments;
 
 --disable_query_log
 set global innodb_trx_rseg_n_slots_debug = @old_innodb_trx_rseg_n_slots_debug;

mysql-test/suite/innodb/t/innodb_bug14676111.test

@@ -13,9 +13,9 @@ if (`select count(*)=0 from information_schema.global_variables where variable_n
 --disable_query_log
 set @old_innodb_limit_optimistic_insert_debug = @@innodb_limit_optimistic_insert_debug;
 set @old_innodb_stats_persistent = @@innodb_stats_persistent;
-set @old_innodb_undo_logs = @@innodb_undo_logs;
+set @old_innodb_rollback_segments = @@innodb_rollback_segments;
 # Limit undo segments for stable progress of purge.
-set global innodb_undo_logs = 1;
+set global innodb_rollback_segments = 1;
 --enable_query_log
 --disable_warnings
 drop table if exists t1;
@@ -139,5 +139,5 @@ drop table t1;
 --disable_query_log
 set global innodb_limit_optimistic_insert_debug = @old_innodb_limit_optimistic_insert_debug;
 set global innodb_stats_persistent = @old_innodb_stats_persistent;
-set global innodb_undo_logs = @old_innodb_undo_logs;
+set global innodb_rollback_segments = @old_innodb_rollback_segments;
 --enable_query_log

mysql-test/suite/innodb/t/innodb_wl6915_debug.test

@@ -23,7 +23,7 @@ call mtr.add_suppression("Found .* prepared XA transactions");
 # Will test following scenarios:
 # 1. Hitting crash while preparing xa trx.
 # 2. Hitting crash while committing normal trx involving temp/non-temp tables.
-# 3. try to start server with different values of innodb_undo_logs.
+# 3. try to start server with different values of innodb_rollback_segments.
 #    (try scenario such that a rollback segment is shared by multiple trxs).
 #
 ################################################################################
@@ -108,10 +108,10 @@ drop procedure populate_t1_t2;
 
 #-----------------------------------------------------------------------------
 #
-# 3. try to start server with different values of innodb_undo_logs.
+# 3. try to start server with different values of innodb_rollback_segments.
 #    (try scenario such that a rollback segment is shared by multiple trxs).
 #
-let $restart_parameters = restart: --innodb_undo_logs=1;
+let $restart_parameters = restart: --innodb_rollback_segments=1;
 --source include/restart_mysqld.inc
 #
 create table t (i int) engine=innodb;
@@ -160,9 +160,9 @@ connection default;
 drop table t2;
 drop procedure populate_t1_t2;
 #
-# trying with value innodb_undo_logs = 10 (so only slot-0 redo rseg is active)
+# trying with value innodb_rollback_segments = 10 (so only slot-0 redo rseg is active)
 #
-let $restart_parameters = restart: --innodb_undo_logs=10;
+let $restart_parameters = restart: --innodb_rollback_segments=10;
 --source include/restart_mysqld.inc
 #
 create table t (i int) engine=innodb;
@@ -174,9 +174,9 @@ insert into t values (2);
 drop table t;
 drop table t2;
 #
-# trying with value innodb_undo_logs = 40 (this will make 8 redo rseg active).
+# trying with value innodb_rollback_segments = 40 (this will make 8 redo rseg active).
 #
-let $restart_parameters = restart: --innodb_undo_logs=40;
+let $restart_parameters = restart: --innodb_rollback_segments=40;
 --source include/restart_mysqld.inc
 #
 create table t (i int) engine=innodb;

mysql-test/suite/innodb/t/log_file.test

@@ -18,7 +18,7 @@ EOF
 
 --append_file $bugdir/my.cnf
 innodb_data_file_path = ibdata1:10M;ibdata2:10M:autoextend
-innodb_undo_logs = 20
+innodb_rollback_segments = 20
 innodb_undo_tablespaces = 3
 innodb_log_files_in_group = 3
 EOF

mysql-test/suite/innodb_undo/r/truncate.result

@@ -1,4 +1,4 @@
-# restart: --innodb_undo_tablespaces=2 --innodb_undo_logs=35
+# restart: --innodb_undo_tablespaces=2 --innodb_rollback_segments=35
 create table t1
 (keyc int, c1 char(100), c2 char(100),
 primary key(keyc)) engine = innodb;

mysql-test/suite/innodb_undo/t/noop-master.opt

@@ -1 +1 @@
---innodb_max_undo_log_size=10M --innodb_purge_rseg_truncate_frequency=1 --innodb_undo_log_truncate=1 --innodb_undo_logs=35
+--innodb_max_undo_log_size=10M --innodb_purge_rseg_truncate_frequency=1 --innodb_undo_log_truncate=1 --innodb_rollback_segments=35

mysql-test/suite/innodb_undo/t/trunc_multi_client_01-master.opt

@@ -1 +1 @@
---innodb_undo_log_truncate=1 --innodb_undo_logs=35 --innodb_max_undo_log_size=10M --innodb_purge_rseg_truncate_frequency=1
+--innodb_undo_log_truncate=1 --innodb_rollback_segments=35 --innodb_max_undo_log_size=10M --innodb_purge_rseg_truncate_frequency=1

mysql-test/suite/innodb_undo/t/truncate.test

@@ -10,7 +10,7 @@
 --source include/big_test.inc
 
 
---let $restart_parameters="restart: --innodb_undo_tablespaces=2 --innodb_undo_logs=35"
+--let $restart_parameters="restart: --innodb_undo_tablespaces=2 --innodb_rollback_segments=35"
 --source include/restart_mysqld.inc
 
 ################################################################################

mysql-test/suite/innodb_undo/t/truncate_recover-master.opt

@@ -1 +1 @@
---innodb_undo_log_truncate=1 --innodb_undo_logs=35 --innodb_max_undo_log_size=10M --innodb_purge_rseg_truncate_frequency=1
+--innodb_undo_log_truncate=1 --innodb_rollback_segments=35 --innodb_max_undo_log_size=10M --innodb_purge_rseg_truncate_frequency=1

mysql-test/suite/innodb_undo/t/undo_space_id-master.opt

@@ -1 +1 @@
---innodb_undo_log_truncate=1 --innodb_undo_logs=35 --innodb_max_undo_log_size=10M --innodb_purge_rseg_truncate_frequency=1
+--innodb_undo_log_truncate=1 --innodb_rollback_segments=35 --innodb_max_undo_log_size=10M --innodb_purge_rseg_truncate_frequency=1

mysql-test/suite/innodb_zip/r/wl6915_1.result

@@ -939,7 +939,7 @@ c1	c2	c3	c4	c5	c6	c7	c9	c10	c11
 -2	-2	a	a	a	a	a	100.550	99	test
 DROP TABLE t1_1 ,t2_1 ,t3_1,t4_1;
 DROP TABLE t1_2 ,t2_2 ,t3_2,t4_2;
-# restart: --innodb_undo_tablespaces=0 --innodb_rollback_segments=20 --innodb_undo_logs=20 --innodb_log_files_in_group=4
+# restart: --innodb_undo_tablespaces=0 --innodb_rollback_segments=20 --innodb_rollback_segments=20 --innodb_log_files_in_group=4
 call populate_tables('_1');;
 call populate_tables('_2');;
 "#connection 1 - verify tables"
@@ -1498,7 +1498,7 @@ c1
 138
 140
 DROP TABLE t1_2 ,t2_2 ,t3_2,t4_2;
-# restart: --innodb_undo_tablespaces=0 --innodb_rollback_segments=30 --innodb_undo_logs=20 --innodb_log_files_in_group=4
+# restart: --innodb_undo_tablespaces=0 --innodb_rollback_segments=30 --innodb_rollback_segments=20 --innodb_log_files_in_group=4
 call populate_tables('_1');;
 call populate_tables('_2');;
 "#connection 1 - verify tables"

mysql-test/suite/innodb_zip/t/wl6915_1.test

@@ -25,9 +25,9 @@
 # - Check constraints like duplicate key,default value             #
 # - Alter ADD COLUMN , ADD PRIMARY KEY                             #
 # - Flush Tables, logs command                                     #
-# - Vary innodb_undo_tablespaces=0,innodb_undo_logs                # 
+# - Vary innodb_undo_tablespaces=0,innodb_rollback_segments        #
 #    innodb_log_files_in_group                                     #
-# - Verify rseg message from server log                            # 
+# - Verify rseg message from server log                            #
 ####################################################################
 
 # run for page size >= 8k
@@ -515,9 +515,9 @@ disconnect con2;
 
 connection default;
 #
-## trying with VALUES innodb_undo_tablespaces, innodb_undo_logs ,innodb_log_files_in_group
+## trying with VALUES innodb_undo_tablespaces, innodb_rollback_segments, innodb_log_files_in_group
 ##
-let $restart_parameters = restart: --innodb_undo_tablespaces=0 --innodb_rollback_segments=20 --innodb_undo_logs=20 --innodb_log_files_in_group=4;
+let $restart_parameters = restart: --innodb_undo_tablespaces=0 --innodb_rollback_segments=20 --innodb_rollback_segments=20 --innodb_log_files_in_group=4;
 --source include/restart_mysqld.inc
 
 # Create two client for concurrent execution
@@ -573,8 +573,8 @@ DROP TABLE t1_2 ,t2_2 ,t3_2,t4_2;
 disconnect con2;
 
 connection default;
-# innodb_undo_logs > non redo rsegment
-let $restart_parameters = restart: --innodb_undo_tablespaces=0 --innodb_rollback_segments=30 --innodb_undo_logs=20 --innodb_log_files_in_group=4;
+# innodb_rollback_segments > non redo rsegment
+let $restart_parameters = restart: --innodb_undo_tablespaces=0 --innodb_rollback_segments=30 --innodb_rollback_segments=20 --innodb_log_files_in_group=4;
 --source include/restart_mysqld.inc
 
 connect (con1,localhost,root,,);

mysql-test/suite/sys_vars/r/innodb_undo_logs_basic.result

@@ -3,6 +3,8 @@ SELECT @@GLOBAL.innodb_undo_logs;
 128
 128 Expected
 SET @@GLOBAL.innodb_undo_logs=128;
+Warnings:
+Warning	131	The parameter innodb_undo_logs is deprecated and may be removed in future releases. Please use innodb_rollback_segments instead. See http://dev.mysql.com/doc/refman/5.7/en/innodb-undo-logs.html
 SELECT COUNT(@@GLOBAL.innodb_undo_logs);
 COUNT(@@GLOBAL.innodb_undo_logs)
 1
@@ -37,32 +39,46 @@ select @@innodb_undo_logs;
 set global innodb_undo_logs = 129;
 Warnings:
 Warning	1292	Truncated incorrect innodb_undo_logs value: '129'
+Warning	131	The parameter innodb_undo_logs is deprecated and may be removed in future releases. Please use innodb_rollback_segments instead. See http://dev.mysql.com/doc/refman/5.7/en/innodb-undo-logs.html
 select @@innodb_undo_logs;
 @@innodb_undo_logs
 128
 128 Expected
 set global innodb_undo_logs = 0;
 Warnings:
 Warning	1292	Truncated incorrect innodb_undo_logs value: '0'
+Warning	131	The parameter innodb_undo_logs is deprecated and may be removed in future releases. Please use innodb_rollback_segments instead. See http://dev.mysql.com/doc/refman/5.7/en/innodb-undo-logs.html
 select @@innodb_undo_logs;
 @@innodb_undo_logs
 1
 1 Expected
 set global innodb_undo_logs = -1;
 Warnings:
 Warning	1292	Truncated incorrect innodb_undo_logs value: '-1'
+Warning	131	The parameter innodb_undo_logs is deprecated and may be removed in future releases. Please use innodb_rollback_segments instead. See http://dev.mysql.com/doc/refman/5.7/en/innodb-undo-logs.html
 select @@innodb_undo_logs;
 @@innodb_undo_logs
 1
 1 Expected
 set global innodb_undo_logs = 50;
+Warnings:
+Warning	131	The parameter innodb_undo_logs is deprecated and may be removed in future releases. Please use innodb_rollback_segments instead. See http://dev.mysql.com/doc/refman/5.7/en/innodb-undo-logs.html
 select @@innodb_undo_logs;
 @@innodb_undo_logs
 50
 50 Expected
 set global innodb_undo_logs = default;
+Warnings:
+Warning	131	The parameter innodb_undo_logs is deprecated and may be removed in future releases. Please use innodb_rollback_segments instead. See http://dev.mysql.com/doc/refman/5.7/en/innodb-undo-logs.html
 select @@innodb_undo_logs;
 @@innodb_undo_logs
 128
 128 Expected
 End bug 13604034
+# restart: --innodb-undo-logs=100
+SELECT VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='innodb_undo_logs';
+VARIABLE_VALUE
+100
+100 Expected

mysql-test/suite/sys_vars/t/innodb_undo_logs_basic.test

@@ -18,6 +18,10 @@
 
 --source include/have_innodb.inc
 
+--disable_query_log
+call mtr.add_suppression("The parameter innodb_undo_logs is deprecated and may be removed in future releases");
+--enable_query_log
+
 ####################################################################
 #   Display default value                                          #
 ####################################################################
@@ -72,9 +76,11 @@ SELECT COUNT(@@SESSION.innodb_undo_logs);
 --Error ER_BAD_FIELD_ERROR
 SELECT innodb_undo_logs = @@SESSION.innodb_undo_logs;
 
+################################################################################
 # Begin Bug 13604034
 # SET GLOBAL INNODB_UNDO_LOGS=0 SUCCEEDS BUT LEADS TO AN ASSERT
 # MAX_UNDO_LOGS > 0
+################################################################################
 --echo Begin bug 13604034
 select @@innodb_undo_logs;
 --echo 128 Expected
@@ -95,3 +101,16 @@ select @@innodb_undo_logs;
 --echo 128 Expected
 --echo End bug 13604034
 # End Bug 13604034
+
+################################################################################
+# Check that the setting can be set at startup
+################################################################################
+let $restart_parameters = restart: --innodb-undo-logs=100;
+--source include/restart_mysqld.inc
+--disable_warnings
+SELECT VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='innodb_undo_logs';
+--enable_warnings
+--echo 100 Expected
+