Re: bzr commit into mysql-6.0-backup branch (ingo.struewing:2727) Bug#40024

[Øystein Grøvlen]

Ingo,

Note that I on Friday pushed a patch that rewrote a statement to make
backup_ptr_objects_row 'innodb' succeed (BUG#40504).  I guess you fixed 
the same by setting --innodb_autoinc_lock_mode=0, but after my fix this 
should no longer be necessary.

--
Øystein


Ingo Struewing wrote:
> #At file:///home2/mydev/bzrroot/mysql-6.0-bug40024/
> 
>  2727 Ingo Struewing	2008-11-06
>       Bug#40024 - backup_engines suite should automatically run as part of mtr
>       
>       The new test suite backup_engines did not run by default with mysql_test_run.
>       
>       Added the test suite to the list of default suites.
>       Fixed test case problems so that this patch does not add test case failures.
> added:
>   mysql-test/suite/backup_engines/t/backup_ptr_objects_mixed-master.opt
>   mysql-test/suite/backup_engines/t/backup_ptr_objects_row-master.opt
>   mysql-test/suite/backup_engines/t/backup_ptr_objects_stmt-master.opt
> modified:
>   mysql-test/mysql-test-run.pl
>   mysql-test/suite/backup_engines/include/backup_ptr_objects.inc
>   mysql-test/suite/backup_engines/r/backup_ptr_objects_mixed.result
>   mysql-test/suite/backup_engines/r/backup_ptr_objects_row.result
>   mysql-test/suite/backup_engines/r/backup_ptr_objects_stmt.result
>   mysql-test/suite/backup_engines/t/backup_tmp_tables.test
> 
> per-file messages:
>   mysql-test/mysql-test-run.pl
>     Bug#40024 - backup_engines suite should automatically run as part of mtr
>     Added the new backup_engines test suite to the list of default suites.
>   mysql-test/suite/backup_engines/include/backup_ptr_objects.inc
>     Bug#40024 - backup_engines suite should automatically run as part of mtr
>     Added a check for the commandline option --innodb_autoinc_lock_mode=0
>     Fixed preparation section so that it becomes immune against left-overs
>     from other test cases.
>   mysql-test/suite/backup_engines/r/backup_ptr_objects_mixed.result
>     Bug#40024 - backup_engines suite should automatically run as part of mtr
>     Updated test result.
>   mysql-test/suite/backup_engines/r/backup_ptr_objects_row.result
>     Bug#40024 - backup_engines suite should automatically run as part of mtr
>     Updated test result.
>   mysql-test/suite/backup_engines/r/backup_ptr_objects_stmt.result
>     Bug#40024 - backup_engines suite should automatically run as part of mtr
>     Updated test result.
>   mysql-test/suite/backup_engines/t/backup_ptr_objects_mixed-master.opt
>     Bug#40024 - backup_engines suite should automatically run as part of mtr
>     New option file to add the option --innodb_autoinc_lock_mode=0
>   mysql-test/suite/backup_engines/t/backup_ptr_objects_row-master.opt
>     Bug#40024 - backup_engines suite should automatically run as part of mtr
>     New option file to add the option --innodb_autoinc_lock_mode=0
>   mysql-test/suite/backup_engines/t/backup_ptr_objects_stmt-master.opt
>     Bug#40024 - backup_engines suite should automatically run as part of mtr
>     New option file to add the option --innodb_autoinc_lock_mode=0
>   mysql-test/suite/backup_engines/t/backup_tmp_tables.test
>     Bug#40024 - backup_engines suite should automatically run as part of mtr
>     Disabled the test case for embedded server.
> === modified file 'mysql-test/mysql-test-run.pl'
> --- a/mysql-test/mysql-test-run.pl	2008-10-23 16:29:52 +0000
> +++ b/mysql-test/mysql-test-run.pl	2008-11-06 16:51:04 +0000
> @@ -133,7 +133,7 @@ our $default_vardir;
>  
>  our $opt_usage;
>  our $opt_suites;
> -our $opt_suites_default= "main,backup,binlog,rpl,rpl_ndb,ndb"; # Default suites to
> run
> +our $opt_suites_default= "main,backup,backup_engines,binlog,rpl,rpl_ndb,ndb"; #
> Default suites to run
>  our $opt_script_debug= 0;  # Script debugging, enable with --script-debug
>  our $opt_verbose= 0;  # Verbose output, enable with --verbose
>  
> 
> === modified file 'mysql-test/suite/backup_engines/include/backup_ptr_objects.inc'
> --- a/mysql-test/suite/backup_engines/include/backup_ptr_objects.inc	2008-10-08
> 04:26:25 +0000
> +++ b/mysql-test/suite/backup_engines/include/backup_ptr_objects.inc	2008-11-06
> 16:51:04 +0000
> @@ -27,6 +27,12 @@ SET @a=UNIX_TIMESTAMP("2010-01-21 15:32:
>  SET timestamp=@a;
>  
>  #
> +# Verify that this test runs with --innodb_autoinc_lock_mode=0
> +# This enforces contiguous auto increment values with innodb.
> +#
> +SELECT @@global.innodb_autoinc_lock_mode;
> +
> +#
>  # Two databases are created ptr_ob1 and ptr_ob2.
>  # ptr_ob1 has tables t1, t2, t3, tv1 and views v ,v1, vv.
>  # v --> ptr_ob1.t1, v1 --> ptr_ob2.t1, vv --> ptr_ob2.v1
> @@ -38,9 +44,15 @@ SET timestamp=@a;
>  # procedure p1, p2 and p3 are created in ptr_ob1 and p4 in ptr_ob2.
>  #
>  
> +# Get rid of old objects in the databases.
> +--disable_warnings
> +DROP DATABASE IF EXISTS ptr_ob1;
> +DROP DATABASE IF EXISTS ptr_ob2;
> +--enable_warnings
> +
>  # Create database
> -CREATE DATABASE IF NOT EXISTS ptr_ob1;
> -CREATE DATABASE IF NOT EXISTS ptr_ob2;
> +CREATE DATABASE ptr_ob1;
> +CREATE DATABASE ptr_ob2;
>  USE ptr_ob1;
>  
>  --echo **** Creating tables ****
> 
> === modified file
> 'mysql-test/suite/backup_engines/r/backup_ptr_objects_mixed.result'
> --- a/mysql-test/suite/backup_engines/r/backup_ptr_objects_mixed.result	2008-10-08
> 04:26:25 +0000
> +++ b/mysql-test/suite/backup_engines/r/backup_ptr_objects_mixed.result	2008-11-06
> 16:51:04 +0000
> @@ -14,8 +14,13 @@ till point of backup and after backup.
>  
>  SET @a=UNIX_TIMESTAMP("2010-01-21 15:32:22");
>  SET timestamp=@a;
> -CREATE DATABASE IF NOT EXISTS ptr_ob1;
> -CREATE DATABASE IF NOT EXISTS ptr_ob2;
> +SELECT @@global.innodb_autoinc_lock_mode;
> +@@global.innodb_autoinc_lock_mode
> +0
> +DROP DATABASE IF EXISTS ptr_ob1;
> +DROP DATABASE IF EXISTS ptr_ob2;
> +CREATE DATABASE ptr_ob1;
> +CREATE DATABASE ptr_ob2;
>  USE ptr_ob1;
>  **** Creating tables ****
>  CREATE TABLE ptr_ob1.t1(
> 
> === modified file 'mysql-test/suite/backup_engines/r/backup_ptr_objects_row.result'
> --- a/mysql-test/suite/backup_engines/r/backup_ptr_objects_row.result	2008-10-08
> 04:26:25 +0000
> +++ b/mysql-test/suite/backup_engines/r/backup_ptr_objects_row.result	2008-11-06
> 16:51:04 +0000
> @@ -14,8 +14,13 @@ till point of backup and after backup.
>  
>  SET @a=UNIX_TIMESTAMP("2010-01-21 15:32:22");
>  SET timestamp=@a;
> -CREATE DATABASE IF NOT EXISTS ptr_ob1;
> -CREATE DATABASE IF NOT EXISTS ptr_ob2;
> +SELECT @@global.innodb_autoinc_lock_mode;
> +@@global.innodb_autoinc_lock_mode
> +0
> +DROP DATABASE IF EXISTS ptr_ob1;
> +DROP DATABASE IF EXISTS ptr_ob2;
> +CREATE DATABASE ptr_ob1;
> +CREATE DATABASE ptr_ob2;
>  USE ptr_ob1;
>  **** Creating tables ****
>  CREATE TABLE ptr_ob1.t1(
> 
> === modified file 'mysql-test/suite/backup_engines/r/backup_ptr_objects_stmt.result'
> --- a/mysql-test/suite/backup_engines/r/backup_ptr_objects_stmt.result	2008-10-08
> 04:26:25 +0000
> +++ b/mysql-test/suite/backup_engines/r/backup_ptr_objects_stmt.result	2008-11-06
> 16:51:04 +0000
> @@ -14,8 +14,13 @@ till point of backup and after backup.
>  
>  SET @a=UNIX_TIMESTAMP("2010-01-21 15:32:22");
>  SET timestamp=@a;
> -CREATE DATABASE IF NOT EXISTS ptr_ob1;
> -CREATE DATABASE IF NOT EXISTS ptr_ob2;
> +SELECT @@global.innodb_autoinc_lock_mode;
> +@@global.innodb_autoinc_lock_mode
> +0
> +DROP DATABASE IF EXISTS ptr_ob1;
> +DROP DATABASE IF EXISTS ptr_ob2;
> +CREATE DATABASE ptr_ob1;
> +CREATE DATABASE ptr_ob2;
>  USE ptr_ob1;
>  **** Creating tables ****
>  CREATE TABLE ptr_ob1.t1(
> 
> === added file
> 'mysql-test/suite/backup_engines/t/backup_ptr_objects_mixed-master.opt'
> ---
> a/mysql-test/suite/backup_engines/t/backup_ptr_objects_mixed-master.opt	1970-01-01
> 00:00:00 +0000
> +++
> b/mysql-test/suite/backup_engines/t/backup_ptr_objects_mixed-master.opt	2008-11-06
> 16:51:04 +0000
> @@ -0,0 +1 @@
> +--innodb_autoinc_lock_mode=0
> 
> === added file 'mysql-test/suite/backup_engines/t/backup_ptr_objects_row-master.opt'
> --- a/mysql-test/suite/backup_engines/t/backup_ptr_objects_row-master.opt	1970-01-01
> 00:00:00 +0000
> +++ b/mysql-test/suite/backup_engines/t/backup_ptr_objects_row-master.opt	2008-11-06
> 16:51:04 +0000
> @@ -0,0 +1 @@
> +--innodb_autoinc_lock_mode=0
> 
> === added file
> 'mysql-test/suite/backup_engines/t/backup_ptr_objects_stmt-master.opt'
> --- a/mysql-test/suite/backup_engines/t/backup_ptr_objects_stmt-master.opt	1970-01-01
> 00:00:00 +0000
> +++ b/mysql-test/suite/backup_engines/t/backup_ptr_objects_stmt-master.opt	2008-11-06
> 16:51:04 +0000
> @@ -0,0 +1 @@
> +--innodb_autoinc_lock_mode=0
> 
> === modified file 'mysql-test/suite/backup_engines/t/backup_tmp_tables.test'
> --- a/mysql-test/suite/backup_engines/t/backup_tmp_tables.test	2008-10-30 12:29:54
> +0000
> +++ b/mysql-test/suite/backup_engines/t/backup_tmp_tables.test	2008-11-06 16:51:04
> +0000
> @@ -3,6 +3,7 @@
>  # with the same names as tables being backed-up (BUG#33574, BUG#34903).
>  #
>  
> +--source include/not_embedded.inc
>  --source include/have_innodb.inc
>  --source suite/backup_engines/include/backup_engine.inc
>  
> 
>