diff options
Diffstat (limited to 'mysql-test/suite')
355 files changed, 4925 insertions, 2513 deletions
diff --git a/mysql-test/suite/atomic/disabled.def b/mysql-test/suite/atomic/disabled.def new file mode 100644 index 00000000000..3e1f2d6a2c3 --- /dev/null +++ b/mysql-test/suite/atomic/disabled.def @@ -0,0 +1,12 @@ +############################################################################## +# +# List the test cases that are to be disabled temporarily. +# +# Separate the test case name and the comment with ':'. +# +# <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment> +# +# Do not use any TAB characters for whitespace. +# +############################################################################## +rename_trigger : MDEV-29282 2022:-08-16 Igor Babaev diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result index d2e904508dc..11abd6e8973 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result @@ -25,7 +25,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -97,7 +97,7 @@ SET INSERT_ID=1/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -163,7 +163,7 @@ SET INSERT_ID=3/*!*/; use `test`/*!*/; SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -208,7 +208,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -253,7 +253,7 @@ SET INSERT_ID=3/*!*/; use `test`/*!*/; SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -280,7 +280,7 @@ SET INSERT_ID=3/*!*/; use `test`/*!*/; SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -325,7 +325,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -368,7 +368,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -430,7 +430,7 @@ SET INSERT_ID=6/*!*/; use `test`/*!*/; SET TIMESTAMP=1773143/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -460,7 +460,7 @@ SET INSERT_ID=1/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -516,7 +516,7 @@ SET INSERT_ID=6/*!*/; use `test`/*!*/; SET TIMESTAMP=1773143/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -546,7 +546,7 @@ SET INSERT_ID=3/*!*/; use `test`/*!*/; SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -584,7 +584,7 @@ SET INSERT_ID=6/*!*/; use `test`/*!*/; SET TIMESTAMP=1773143/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -611,7 +611,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -687,7 +687,7 @@ SET INSERT_ID=3/*!*/; use `test`/*!*/; SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -725,7 +725,7 @@ SET INSERT_ID=6/*!*/; use `test`/*!*/; SET TIMESTAMP=1773143/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -752,7 +752,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -794,7 +794,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -866,7 +866,7 @@ SET INSERT_ID=1/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -931,7 +931,7 @@ SET INSERT_ID=3/*!*/; use `test`/*!*/; SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -976,7 +976,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1020,7 +1020,7 @@ SET INSERT_ID=3/*!*/; use `test`/*!*/; SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1047,7 +1047,7 @@ SET INSERT_ID=3/*!*/; use `test`/*!*/; SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1092,7 +1092,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1134,7 +1134,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1196,7 +1196,7 @@ SET INSERT_ID=6/*!*/; use `test`/*!*/; SET TIMESTAMP=1773143/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1226,7 +1226,7 @@ SET INSERT_ID=1/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1282,7 +1282,7 @@ SET INSERT_ID=6/*!*/; use `test`/*!*/; SET TIMESTAMP=1773143/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1311,7 +1311,7 @@ SET INSERT_ID=3/*!*/; use `test`/*!*/; SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1349,7 +1349,7 @@ SET INSERT_ID=6/*!*/; use `test`/*!*/; SET TIMESTAMP=1773143/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1376,7 +1376,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1450,7 +1450,7 @@ SET INSERT_ID=3/*!*/; use `test`/*!*/; SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1488,7 +1488,7 @@ SET INSERT_ID=6/*!*/; use `test`/*!*/; SET TIMESTAMP=1773143/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1515,7 +1515,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1557,7 +1557,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result index 9195f9fd3ad..816084d7464 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result @@ -376,7 +376,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -5386,7 +5386,7 @@ DELIMITER /*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result index 96059d009c0..65e2f824e39 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result @@ -2270,7 +2270,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; @@ -5279,7 +5279,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; @@ -5679,7 +5679,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; @@ -6317,7 +6317,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result index 630a9f1d381..3f838c8c369 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result @@ -2268,7 +2268,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; @@ -5300,7 +5300,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; @@ -5706,7 +5706,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; @@ -6354,7 +6354,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result index 748b92df1a8..5a27afaae71 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result @@ -146,7 +146,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_row_annotate.result b/mysql-test/suite/binlog/r/binlog_row_annotate.result index ffdb31cdbeb..bf114d8cfa9 100644 --- a/mysql-test/suite/binlog/r/binlog_row_annotate.result +++ b/mysql-test/suite/binlog/r/binlog_row_annotate.result @@ -116,7 +116,7 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid> SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -354,7 +354,7 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid> SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -513,7 +513,7 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid> SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -739,7 +739,7 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid> SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -977,7 +977,7 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid> SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1136,7 +1136,7 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid> SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result b/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result index 74aef814785..6d10d5420e4 100644 --- a/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result +++ b/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result @@ -22,7 +22,7 @@ START TRANSACTION #Q> insert into t2 values (@v) SET TIMESTAMP=10000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -92,7 +92,7 @@ DELIMITER /*!*/; use `test`/*!*/; SET TIMESTAMP=XXX/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result b/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result index dc7750b975e..fe08f6e9fe9 100644 --- a/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result +++ b/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result @@ -50,7 +50,7 @@ use `new_test1`/*!*/; #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid> SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -291,7 +291,7 @@ use `new_test1`/*!*/; #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid> SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result b/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result index e449025eee9..c78365a847e 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result +++ b/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result @@ -21,7 +21,7 @@ SET @`v`:=_ucs2 X'006100620063' COLLATE `ucs2_general_ci`/*!*/; use `test`/*!*/; SET TIMESTAMP=10000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -94,7 +94,7 @@ DELIMITER /*!*/; use `test`/*!*/; SET TIMESTAMP=XXX/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata.result b/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata.result index 5e85a72f693..21275409f36 100644 --- a/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata.result +++ b/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata.result @@ -5,7 +5,8 @@ SET GLOBAL binlog_row_metadata = MINIMAL; # CREATE TABLE t1(c_year YEAR, c_date DATE, c_time TIME, c_time_f TIME(3), c_datetime DATETIME, c_datetime_f DATETIME(3), -c_timestamp TIMESTAMP, c_timestamp_f TIMESTAMP(3) DEFAULT "2017-1-1 10:10:10"); +c_timestamp TIMESTAMP NOT NULL DEFAULT NOW(), +c_timestamp_f TIMESTAMP(3) DEFAULT "2017-1-1 10:10:10"); INSERT INTO t1(c_year) VALUES(2017); # Columns(YEAR, # DATE, @@ -14,7 +15,7 @@ INSERT INTO t1(c_year) VALUES(2017); # DATETIME, # DATETIME(3), # TIMESTAMP NOT NULL, -# TIMESTAMP(3) NOT NULL) +# TIMESTAMP(3)) DROP TABLE t1; RESET MASTER; # diff --git a/mysql-test/suite/binlog/r/binlog_unsafe.result b/mysql-test/suite/binlog/r/binlog_unsafe.result index a8143ef086e..0c0b0e77915 100644 --- a/mysql-test/suite/binlog/r/binlog_unsafe.result +++ b/mysql-test/suite/binlog/r/binlog_unsafe.result @@ -2609,6 +2609,9 @@ INSERT INTO t1 VALUES (VERSION()); Warnings: Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave INSERT INTO t1 VALUES (RAND()); +INSERT INTO t1 VALUES (RANDOM_BYTES(1000)); +Warnings: +Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave DELETE FROM t1; SET TIME_ZONE= '+03:00'; SET TIMESTAMP=1000000; diff --git a/mysql-test/suite/binlog/r/flashback.result b/mysql-test/suite/binlog/r/flashback.result index 7d65a8ec2b3..da08f814783 100644 --- a/mysql-test/suite/binlog/r/flashback.result +++ b/mysql-test/suite/binlog/r/flashback.result @@ -60,7 +60,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -422,7 +422,7 @@ COMMIT use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/binlog/t/binlog_table_map_optional_metadata.test b/mysql-test/suite/binlog/t/binlog_table_map_optional_metadata.test index 9fd201e0cb9..4577c6c1de1 100644 --- a/mysql-test/suite/binlog/t/binlog_table_map_optional_metadata.test +++ b/mysql-test/suite/binlog/t/binlog_table_map_optional_metadata.test @@ -29,7 +29,8 @@ SET GLOBAL binlog_row_metadata = MINIMAL; --echo # CREATE TABLE t1(c_year YEAR, c_date DATE, c_time TIME, c_time_f TIME(3), c_datetime DATETIME, c_datetime_f DATETIME(3), - c_timestamp TIMESTAMP, c_timestamp_f TIMESTAMP(3) DEFAULT "2017-1-1 10:10:10"); + c_timestamp TIMESTAMP NOT NULL DEFAULT NOW(), + c_timestamp_f TIMESTAMP(3) DEFAULT "2017-1-1 10:10:10"); INSERT INTO t1(c_year) VALUES(2017); --source include/print_optional_metadata.inc diff --git a/mysql-test/suite/binlog/t/binlog_unsafe.test b/mysql-test/suite/binlog/t/binlog_unsafe.test index 673712ff209..8b2a00e174c 100644 --- a/mysql-test/suite/binlog/t/binlog_unsafe.test +++ b/mysql-test/suite/binlog/t/binlog_unsafe.test @@ -651,7 +651,7 @@ DROP TABLE t1,t2,t3; # # BUG#47995: Mark user functions as unsafe -# BUG#49222: Mare RAND() unsafe +# BUG#49222: Mark RAND() unsafe # # Test that the system functions that are supposed to be marked unsafe # generate a warning. Each INSERT statement below should generate a @@ -678,6 +678,7 @@ INSERT INTO t1 VALUES (UUID()); #marked unsafe before BUG#47995 INSERT INTO t1 VALUES (UUID_SHORT()); #marked unsafe before BUG#47995 INSERT INTO t1 VALUES (VERSION()); #marked unsafe in BUG#47995 INSERT INTO t1 VALUES (RAND()); #marked unsafe in BUG#49222 +INSERT INTO t1 VALUES (RANDOM_BYTES(1000)); #marked unsafe in MDEV-25704 DELETE FROM t1; # Since we replicate the TIMESTAMP variable, functions affected by the diff --git a/mysql-test/suite/binlog_encryption/binlog_mdev_20574_old_binlog.result b/mysql-test/suite/binlog_encryption/binlog_mdev_20574_old_binlog.result index cf660297640..a8d96642bd1 100644 --- a/mysql-test/suite/binlog_encryption/binlog_mdev_20574_old_binlog.result +++ b/mysql-test/suite/binlog_encryption/binlog_mdev_20574_old_binlog.result @@ -12,7 +12,7 @@ include/rpl_start_server.inc [server_number=1] connection slave; RESET SLAVE; RESET MASTER; -CHANGE MASTER TO master_host='127.0.0.1', master_port=SERVER_MYPORT_1, master_user='root', master_log_file='master-bin.000001', master_log_pos=4; +CHANGE MASTER TO master_host='127.0.0.1', master_port=SERVER_MYPORT_1, master_user='root', master_log_file='master-bin.000001', master_log_pos=4, master_use_gtid=no; include/start_slave.inc DESC t1; Field Type Null Key Default Extra diff --git a/mysql-test/suite/binlog_encryption/binlog_mdev_20574_old_binlog.test b/mysql-test/suite/binlog_encryption/binlog_mdev_20574_old_binlog.test index 417df631878..3f8220630ba 100644 --- a/mysql-test/suite/binlog_encryption/binlog_mdev_20574_old_binlog.test +++ b/mysql-test/suite/binlog_encryption/binlog_mdev_20574_old_binlog.test @@ -36,7 +36,7 @@ RESET SLAVE; RESET MASTER; --replace_result $SERVER_MYPORT_1 SERVER_MYPORT_1 -eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$SERVER_MYPORT_1, master_user='root', master_log_file='master-bin.000001', master_log_pos=4; +eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$SERVER_MYPORT_1, master_user='root', master_log_file='master-bin.000001', master_log_pos=4, master_use_gtid=no; --source include/start_slave.inc --sync_with_master DESC t1; diff --git a/mysql-test/suite/binlog_encryption/binlog_row_annotate.result b/mysql-test/suite/binlog_encryption/binlog_row_annotate.result index 80b9c5d476c..2614020b7a9 100644 --- a/mysql-test/suite/binlog_encryption/binlog_row_annotate.result +++ b/mysql-test/suite/binlog_encryption/binlog_row_annotate.result @@ -120,7 +120,7 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid> SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -361,7 +361,7 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid> SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -523,7 +523,7 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid> SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/binlog_encryption/encrypted_master_switch_to_unencrypted.result b/mysql-test/suite/binlog_encryption/encrypted_master_switch_to_unencrypted.result index d632c565ad2..a628d0d409b 100644 --- a/mysql-test/suite/binlog_encryption/encrypted_master_switch_to_unencrypted.result +++ b/mysql-test/suite/binlog_encryption/encrypted_master_switch_to_unencrypted.result @@ -4,6 +4,11 @@ include/rpl_init.inc [topology=1->2] connection server_2; include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc +connection server_1; +connection server_2; +include/stop_slave.inc ##################################################### # Part 1: unencrypted master ##################################################### @@ -63,7 +68,9 @@ SHOW TABLES; Tables_in_test table1_no_encryption include/stop_slave.inc -reset slave; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' ########## # Cleanup ########## diff --git a/mysql-test/suite/binlog_encryption/encrypted_master_switch_to_unencrypted.test b/mysql-test/suite/binlog_encryption/encrypted_master_switch_to_unencrypted.test index 1e1b0cbd353..d36086da73b 100644 --- a/mysql-test/suite/binlog_encryption/encrypted_master_switch_to_unencrypted.test +++ b/mysql-test/suite/binlog_encryption/encrypted_master_switch_to_unencrypted.test @@ -20,6 +20,13 @@ --let $rpl_topology= 1->2 --source include/rpl_init.inc +--connection server_2 +--source include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +--source include/start_slave.inc + +--connection server_1 + --enable_connect_log # We stop replication because we want it to happen after the switch @@ -132,7 +139,8 @@ SHOW TABLES; --disable_connect_log --source include/stop_slave.inc --enable_connect_log -reset slave; +--let $master_use_gtid_option= No +--source include/reset_slave.inc --echo ########## --echo # Cleanup diff --git a/mysql-test/suite/binlog_encryption/multisource.result b/mysql-test/suite/binlog_encryption/multisource.result index ad1f2e24f9e..4b53b4653cd 100644 --- a/mysql-test/suite/binlog_encryption/multisource.result +++ b/mysql-test/suite/binlog_encryption/multisource.result @@ -99,7 +99,8 @@ set default_master_connection = ''; change master to master_port=MYPORT_2, master_host='127.0.0.1', -master_user='root'; +master_user='root', +master_use_gtid=no; start slave; include/wait_for_slave_to_start.inc # diff --git a/mysql-test/suite/binlog_encryption/rpl_binlog_errors.result b/mysql-test/suite/binlog_encryption/rpl_binlog_errors.result index 4c667bd7f5a..0c79b079bd6 100644 --- a/mysql-test/suite/binlog_encryption/rpl_binlog_errors.result +++ b/mysql-test/suite/binlog_encryption/rpl_binlog_errors.result @@ -232,6 +232,9 @@ connection master; ####################################################################### include/rpl_reset.inc connection slave; +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc call mtr.add_suppression("Slave I/O: Relay log write failure: could not queue event from master.*"); call mtr.add_suppression("Error writing file .*"); call mtr.add_suppression("Could not use .*"); @@ -277,5 +280,7 @@ include/stop_slave_sql.inc Warnings: Note 1255 Slave already has been stopped RESET SLAVE; +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' RESET MASTER; include/rpl_end.inc diff --git a/mysql-test/suite/binlog_encryption/rpl_cant_read_event_incident.result b/mysql-test/suite/binlog_encryption/rpl_cant_read_event_incident.result index 5aff978538f..86659816f6c 100644 --- a/mysql-test/suite/binlog_encryption/rpl_cant_read_event_incident.result +++ b/mysql-test/suite/binlog_encryption/rpl_cant_read_event_incident.result @@ -2,6 +2,9 @@ include/master-slave.inc [connection master] connection slave; include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc +include/stop_slave.inc connection master; call mtr.add_suppression("Error in Log_event::read_log_event()"); include/rpl_stop_server.inc [server_number=1] @@ -10,7 +13,9 @@ show binlog events; ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error connection slave; call mtr.add_suppression("Slave I/O: Got fatal error 1236 from master when reading data from binary log"); -reset slave; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' start slave; include/wait_for_slave_param.inc [Last_IO_Errno] Last_IO_Errno = '1236' @@ -20,6 +25,8 @@ reset master; connection slave; stop slave; reset slave; +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' drop table if exists t; reset master; End of the tests diff --git a/mysql-test/suite/binlog_encryption/rpl_checksum.result b/mysql-test/suite/binlog_encryption/rpl_checksum.result index 22220b8e9fb..0b894e05a46 100644 --- a/mysql-test/suite/binlog_encryption/rpl_checksum.result +++ b/mysql-test/suite/binlog_encryption/rpl_checksum.result @@ -1,5 +1,10 @@ include/master-slave.inc [connection master] +connection slave; +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc +connection master; call mtr.add_suppression('Slave can not handle replication events with the checksum that master is configured to log'); call mtr.add_suppression('Replication event checksum verification failed'); call mtr.add_suppression('Relay log write failure: could not queue event from master'); @@ -122,7 +127,9 @@ must be zero 0 connection slave; stop slave; -reset slave; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' set @@global.binlog_checksum= IF(floor((rand()*1000)%2), "CRC32", "NONE"); flush logs; connection master; diff --git a/mysql-test/suite/binlog_encryption/rpl_corruption.result b/mysql-test/suite/binlog_encryption/rpl_corruption.result index 73bb373d6be..7c60e15a567 100644 --- a/mysql-test/suite/binlog_encryption/rpl_corruption.result +++ b/mysql-test/suite/binlog_encryption/rpl_corruption.result @@ -1,5 +1,10 @@ include/master-slave.inc [connection master] +connection slave; +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc +connection master; call mtr.add_suppression('Found invalid event in binary log'); call mtr.add_suppression('Slave I/O: Relay log write failure: could not queue event from master'); call mtr.add_suppression('event read from binlog did not pass crc check'); diff --git a/mysql-test/suite/binlog_encryption/rpl_gtid_basic.result b/mysql-test/suite/binlog_encryption/rpl_gtid_basic.result index 4e17669605f..99eda3b61a0 100644 --- a/mysql-test/suite/binlog_encryption/rpl_gtid_basic.result +++ b/mysql-test/suite/binlog_encryption/rpl_gtid_basic.result @@ -69,6 +69,8 @@ INSERT INTO t2 VALUES (5, "i1a"); connection server_4; CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT, MASTER_USE_GTID=CURRENT_POS; +Warnings: +Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead include/start_slave.inc SELECT * FROM t1 ORDER BY a; a b @@ -89,6 +91,8 @@ connection server_2; include/stop_slave.inc CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_4, MASTER_USE_GTID=CURRENT_POS; +Warnings: +Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead include/start_slave.inc connection server_4; UPDATE t2 SET b="j1a" WHERE a=5; @@ -117,6 +121,8 @@ include/save_master_gtid.inc connection server_3; CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_4, MASTER_USE_GTID=CURRENT_POS; +Warnings: +Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead include/start_slave.inc include/sync_with_master_gtid.inc SELECT * FROM t2 ORDER BY a; diff --git a/mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.result b/mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.result index 944ad9331ad..e94e097f41f 100644 --- a/mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.result +++ b/mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.result @@ -1,5 +1,10 @@ include/master-slave.inc [connection master] +connection slave; +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc +connection master; call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); call mtr.add_suppression("Write to binary log failed: Multi-row statements required more than .max_binlog_stmt_cache_size"); call mtr.add_suppression("Write to binary log failed: Multi-statement transaction required more than .max_binlog_cache_size"); diff --git a/mysql-test/suite/binlog_encryption/rpl_semi_sync.result b/mysql-test/suite/binlog_encryption/rpl_semi_sync.result index d18bd1efda7..edd5e7748e0 100644 --- a/mysql-test/suite/binlog_encryption/rpl_semi_sync.result +++ b/mysql-test/suite/binlog_encryption/rpl_semi_sync.result @@ -6,16 +6,18 @@ call mtr.add_suppression("Read semi-sync reply"); call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT."); call mtr.add_suppression("mysqld: Got an error reading communication packets"); connection slave; +set sql_log_bin=0; call mtr.add_suppression("Master server does not support semi-sync"); call mtr.add_suppression("Semi-sync slave .* reply"); call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group"); +set sql_log_bin=1; connection master; # # Uninstall semi-sync plugins on master and slave # connection slave; include/stop_slave.inc -reset slave; +include/reset_slave.inc set global rpl_semi_sync_master_enabled= 0; set global rpl_semi_sync_slave_enabled= 0; connection master; @@ -310,7 +312,7 @@ Variable_name Value Rpl_semi_sync_master_yes_tx 0 connection slave; include/stop_slave.inc -reset slave; +include/reset_slave.inc include/kill_binlog_dump_threads.inc connection slave; include/start_slave.inc @@ -340,7 +342,7 @@ Rpl_semi_sync_master_yes_tx 3 # connection slave; include/stop_slave.inc -reset slave; +include/reset_slave.inc connection master; reset master; include/kill_binlog_dump_threads.inc diff --git a/mysql-test/suite/binlog_encryption/rpl_skip_replication.result b/mysql-test/suite/binlog_encryption/rpl_skip_replication.result index 59d5b50e5cc..96e0a30331d 100644 --- a/mysql-test/suite/binlog_encryption/rpl_skip_replication.result +++ b/mysql-test/suite/binlog_encryption/rpl_skip_replication.result @@ -1,6 +1,11 @@ include/master-slave.inc [connection master] connection slave; +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc +connection master; +connection slave; CREATE USER 'nonsuperuser'@'127.0.0.1'; GRANT ALTER,CREATE,DELETE,DROP,EVENT,INSERT,PROCESS,REPLICATION SLAVE, SELECT,UPDATE ON *.* TO 'nonsuperuser'@'127.0.0.1'; diff --git a/mysql-test/suite/compat/maxdb/rpl_mariadb_timestamp.result b/mysql-test/suite/compat/maxdb/rpl_mariadb_timestamp.result index df3bbca0fa2..727c79492ed 100644 --- a/mysql-test/suite/compat/maxdb/rpl_mariadb_timestamp.result +++ b/mysql-test/suite/compat/maxdb/rpl_mariadb_timestamp.result @@ -5,7 +5,7 @@ include/master-slave.inc # SET timestamp=UNIX_TIMESTAMP('2001-01-01 10:00:00'); SET sql_mode=DEFAULT; -CREATE TABLE t1 (a TIMESTAMP); +CREATE TABLE t1 (a TIMESTAMP NOT NULL DEFAULT NOW()); INSERT INTO t1 VALUES (NULL); INSERT INTO t1 VALUES ('2001-01-01 10:20:30'); SET sql_mode=MAXDB; @@ -14,7 +14,7 @@ SET timestamp=DEFAULT; include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Gtid # # GTID #-#-# -master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a TIMESTAMP) +master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a TIMESTAMP NOT NULL DEFAULT NOW()) master-bin.000001 # Gtid # # BEGIN GTID #-#-# master-bin.000001 # Annotate_rows # # INSERT INTO t1 VALUES (NULL) master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -42,7 +42,7 @@ SET sql_mode=DEFAULT; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `a` timestamp NOT NULL DEFAULT current_timestamp() ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW CREATE TABLE t2; Table Create Table diff --git a/mysql-test/suite/compat/maxdb/rpl_mariadb_timestamp.test b/mysql-test/suite/compat/maxdb/rpl_mariadb_timestamp.test index 50663229937..f4a826615eb 100644 --- a/mysql-test/suite/compat/maxdb/rpl_mariadb_timestamp.test +++ b/mysql-test/suite/compat/maxdb/rpl_mariadb_timestamp.test @@ -7,7 +7,7 @@ SET timestamp=UNIX_TIMESTAMP('2001-01-01 10:00:00'); SET sql_mode=DEFAULT; -CREATE TABLE t1 (a TIMESTAMP); +CREATE TABLE t1 (a TIMESTAMP NOT NULL DEFAULT NOW()); INSERT INTO t1 VALUES (NULL); INSERT INTO t1 VALUES ('2001-01-01 10:20:30'); SET sql_mode=MAXDB; @@ -17,7 +17,6 @@ SET timestamp=DEFAULT; --let $binlog_file = LAST source include/show_binlog_events.inc; - --sync_slave_with_master SELECT * FROM t1; SET sql_mode=DEFAULT; diff --git a/mysql-test/suite/compat/maxdb/type_timestamp.result b/mysql-test/suite/compat/maxdb/type_timestamp.result index 7bc0613bc56..f6612ab18da 100644 --- a/mysql-test/suite/compat/maxdb/type_timestamp.result +++ b/mysql-test/suite/compat/maxdb/type_timestamp.result @@ -11,18 +11,18 @@ max_timestamp maxdb_schema.TIMESTAMP SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `def_timestamp` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `mdb_timestamp` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `ora_timestamp` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `def_timestamp` timestamp NULL DEFAULT NULL, + `mdb_timestamp` timestamp NULL DEFAULT NULL, + `ora_timestamp` timestamp NULL DEFAULT NULL, `max_timestamp` datetime DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SET sql_mode=MAXDB; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "def_timestamp" mariadb_schema.timestamp NOT NULL DEFAULT current_timestamp(), - "mdb_timestamp" mariadb_schema.timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - "ora_timestamp" mariadb_schema.timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + "def_timestamp" mariadb_schema.timestamp NULL DEFAULT NULL, + "mdb_timestamp" mariadb_schema.timestamp NULL DEFAULT NULL, + "ora_timestamp" mariadb_schema.timestamp NULL DEFAULT NULL, "max_timestamp" datetime DEFAULT NULL ) DROP TABLE t1; @@ -37,8 +37,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( "def_timestamp" datetime DEFAULT NULL, - "mdb_timestamp" mariadb_schema.timestamp NOT NULL DEFAULT current_timestamp(), - "ora_timestamp" mariadb_schema.timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + "mdb_timestamp" mariadb_schema.timestamp NULL DEFAULT NULL, + "ora_timestamp" mariadb_schema.timestamp NULL DEFAULT NULL, "max_timestamp" datetime DEFAULT NULL ) SET sql_mode=DEFAULT; @@ -46,8 +46,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `def_timestamp` datetime DEFAULT NULL, - `mdb_timestamp` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `ora_timestamp` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `mdb_timestamp` timestamp NULL DEFAULT NULL, + `ora_timestamp` timestamp NULL DEFAULT NULL, `max_timestamp` datetime DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; diff --git a/mysql-test/suite/compat/oracle/r/sp.result b/mysql-test/suite/compat/oracle/r/sp.result index 2e212530ae5..409ea3b8e3f 100644 --- a/mysql-test/suite/compat/oracle/r/sp.result +++ b/mysql-test/suite/compat/oracle/r/sp.result @@ -1796,7 +1796,7 @@ def tm6 tm6 11 17 15 Y 128 6 63 def dt0 dt0 12 19 19 Y 128 0 63 def dt3 dt3 12 23 23 Y 128 3 63 def dt6 dt6 12 26 26 Y 128 6 63 -def ts0 ts0 7 19 19 Y 9376 0 63 +def ts0 ts0 7 19 19 Y 160 0 63 def ts3 ts3 7 23 23 Y 160 3 63 def ts6 ts6 7 26 26 Y 160 6 63 bit6 0 diff --git a/mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result b/mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result index b86c28e7344..ea092d1211f 100644 --- a/mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result +++ b/mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result @@ -224,6 +224,190 @@ utf8mb4_general_nopad_ci utf8mb4 1069 # # utf8mb4_nopad_bin utf8mb4 1070 # # utf8mb4_unicode_nopad_ci utf8mb4 1248 # # utf8mb4_unicode_520_nopad_ci utf8mb4 1270 # # +uca1400_ai_ci NULL NULL NULL # # +uca1400_ai_cs NULL NULL NULL # # +uca1400_as_ci NULL NULL NULL # # +uca1400_as_cs NULL NULL NULL # # +uca1400_nopad_ai_ci NULL NULL NULL # # +uca1400_nopad_ai_cs NULL NULL NULL # # +uca1400_nopad_as_ci NULL NULL NULL # # +uca1400_nopad_as_cs NULL NULL NULL # # +uca1400_icelandic_ai_ci NULL NULL NULL # # +uca1400_icelandic_ai_cs NULL NULL NULL # # +uca1400_icelandic_as_ci NULL NULL NULL # # +uca1400_icelandic_as_cs NULL NULL NULL # # +uca1400_icelandic_nopad_ai_ci NULL NULL NULL # # +uca1400_icelandic_nopad_ai_cs NULL NULL NULL # # +uca1400_icelandic_nopad_as_ci NULL NULL NULL # # +uca1400_icelandic_nopad_as_cs NULL NULL NULL # # +uca1400_latvian_ai_ci NULL NULL NULL # # +uca1400_latvian_ai_cs NULL NULL NULL # # +uca1400_latvian_as_ci NULL NULL NULL # # +uca1400_latvian_as_cs NULL NULL NULL # # +uca1400_latvian_nopad_ai_ci NULL NULL NULL # # +uca1400_latvian_nopad_ai_cs NULL NULL NULL # # +uca1400_latvian_nopad_as_ci NULL NULL NULL # # +uca1400_latvian_nopad_as_cs NULL NULL NULL # # +uca1400_romanian_ai_ci NULL NULL NULL # # +uca1400_romanian_ai_cs NULL NULL NULL # # +uca1400_romanian_as_ci NULL NULL NULL # # +uca1400_romanian_as_cs NULL NULL NULL # # +uca1400_romanian_nopad_ai_ci NULL NULL NULL # # +uca1400_romanian_nopad_ai_cs NULL NULL NULL # # +uca1400_romanian_nopad_as_ci NULL NULL NULL # # +uca1400_romanian_nopad_as_cs NULL NULL NULL # # +uca1400_slovenian_ai_ci NULL NULL NULL # # +uca1400_slovenian_ai_cs NULL NULL NULL # # +uca1400_slovenian_as_ci NULL NULL NULL # # +uca1400_slovenian_as_cs NULL NULL NULL # # +uca1400_slovenian_nopad_ai_ci NULL NULL NULL # # +uca1400_slovenian_nopad_ai_cs NULL NULL NULL # # +uca1400_slovenian_nopad_as_ci NULL NULL NULL # # +uca1400_slovenian_nopad_as_cs NULL NULL NULL # # +uca1400_polish_ai_ci NULL NULL NULL # # +uca1400_polish_ai_cs NULL NULL NULL # # +uca1400_polish_as_ci NULL NULL NULL # # +uca1400_polish_as_cs NULL NULL NULL # # +uca1400_polish_nopad_ai_ci NULL NULL NULL # # +uca1400_polish_nopad_ai_cs NULL NULL NULL # # +uca1400_polish_nopad_as_ci NULL NULL NULL # # +uca1400_polish_nopad_as_cs NULL NULL NULL # # +uca1400_estonian_ai_ci NULL NULL NULL # # +uca1400_estonian_ai_cs NULL NULL NULL # # +uca1400_estonian_as_ci NULL NULL NULL # # +uca1400_estonian_as_cs NULL NULL NULL # # +uca1400_estonian_nopad_ai_ci NULL NULL NULL # # +uca1400_estonian_nopad_ai_cs NULL NULL NULL # # +uca1400_estonian_nopad_as_ci NULL NULL NULL # # +uca1400_estonian_nopad_as_cs NULL NULL NULL # # +uca1400_spanish_ai_ci NULL NULL NULL # # +uca1400_spanish_ai_cs NULL NULL NULL # # +uca1400_spanish_as_ci NULL NULL NULL # # +uca1400_spanish_as_cs NULL NULL NULL # # +uca1400_spanish_nopad_ai_ci NULL NULL NULL # # +uca1400_spanish_nopad_ai_cs NULL NULL NULL # # +uca1400_spanish_nopad_as_ci NULL NULL NULL # # +uca1400_spanish_nopad_as_cs NULL NULL NULL # # +uca1400_swedish_ai_ci NULL NULL NULL # # +uca1400_swedish_ai_cs NULL NULL NULL # # +uca1400_swedish_as_ci NULL NULL NULL # # +uca1400_swedish_as_cs NULL NULL NULL # # +uca1400_swedish_nopad_ai_ci NULL NULL NULL # # +uca1400_swedish_nopad_ai_cs NULL NULL NULL # # +uca1400_swedish_nopad_as_ci NULL NULL NULL # # +uca1400_swedish_nopad_as_cs NULL NULL NULL # # +uca1400_turkish_ai_ci NULL NULL NULL # # +uca1400_turkish_ai_cs NULL NULL NULL # # +uca1400_turkish_as_ci NULL NULL NULL # # +uca1400_turkish_as_cs NULL NULL NULL # # +uca1400_turkish_nopad_ai_ci NULL NULL NULL # # +uca1400_turkish_nopad_ai_cs NULL NULL NULL # # +uca1400_turkish_nopad_as_ci NULL NULL NULL # # +uca1400_turkish_nopad_as_cs NULL NULL NULL # # +uca1400_czech_ai_ci NULL NULL NULL # # +uca1400_czech_ai_cs NULL NULL NULL # # +uca1400_czech_as_ci NULL NULL NULL # # +uca1400_czech_as_cs NULL NULL NULL # # +uca1400_czech_nopad_ai_ci NULL NULL NULL # # +uca1400_czech_nopad_ai_cs NULL NULL NULL # # +uca1400_czech_nopad_as_ci NULL NULL NULL # # +uca1400_czech_nopad_as_cs NULL NULL NULL # # +uca1400_danish_ai_ci NULL NULL NULL # # +uca1400_danish_ai_cs NULL NULL NULL # # +uca1400_danish_as_ci NULL NULL NULL # # +uca1400_danish_as_cs NULL NULL NULL # # +uca1400_danish_nopad_ai_ci NULL NULL NULL # # +uca1400_danish_nopad_ai_cs NULL NULL NULL # # +uca1400_danish_nopad_as_ci NULL NULL NULL # # +uca1400_danish_nopad_as_cs NULL NULL NULL # # +uca1400_lithuanian_ai_ci NULL NULL NULL # # +uca1400_lithuanian_ai_cs NULL NULL NULL # # +uca1400_lithuanian_as_ci NULL NULL NULL # # +uca1400_lithuanian_as_cs NULL NULL NULL # # +uca1400_lithuanian_nopad_ai_ci NULL NULL NULL # # +uca1400_lithuanian_nopad_ai_cs NULL NULL NULL # # +uca1400_lithuanian_nopad_as_ci NULL NULL NULL # # +uca1400_lithuanian_nopad_as_cs NULL NULL NULL # # +uca1400_slovak_ai_ci NULL NULL NULL # # +uca1400_slovak_ai_cs NULL NULL NULL # # +uca1400_slovak_as_ci NULL NULL NULL # # +uca1400_slovak_as_cs NULL NULL NULL # # +uca1400_slovak_nopad_ai_ci NULL NULL NULL # # +uca1400_slovak_nopad_ai_cs NULL NULL NULL # # +uca1400_slovak_nopad_as_ci NULL NULL NULL # # +uca1400_slovak_nopad_as_cs NULL NULL NULL # # +uca1400_spanish2_ai_ci NULL NULL NULL # # +uca1400_spanish2_ai_cs NULL NULL NULL # # +uca1400_spanish2_as_ci NULL NULL NULL # # +uca1400_spanish2_as_cs NULL NULL NULL # # +uca1400_spanish2_nopad_ai_ci NULL NULL NULL # # +uca1400_spanish2_nopad_ai_cs NULL NULL NULL # # +uca1400_spanish2_nopad_as_ci NULL NULL NULL # # +uca1400_spanish2_nopad_as_cs NULL NULL NULL # # +uca1400_roman_ai_ci NULL NULL NULL # # +uca1400_roman_ai_cs NULL NULL NULL # # +uca1400_roman_as_ci NULL NULL NULL # # +uca1400_roman_as_cs NULL NULL NULL # # +uca1400_roman_nopad_ai_ci NULL NULL NULL # # +uca1400_roman_nopad_ai_cs NULL NULL NULL # # +uca1400_roman_nopad_as_ci NULL NULL NULL # # +uca1400_roman_nopad_as_cs NULL NULL NULL # # +uca1400_persian_ai_ci NULL NULL NULL # # +uca1400_persian_ai_cs NULL NULL NULL # # +uca1400_persian_as_ci NULL NULL NULL # # +uca1400_persian_as_cs NULL NULL NULL # # +uca1400_persian_nopad_ai_ci NULL NULL NULL # # +uca1400_persian_nopad_ai_cs NULL NULL NULL # # +uca1400_persian_nopad_as_ci NULL NULL NULL # # +uca1400_persian_nopad_as_cs NULL NULL NULL # # +uca1400_esperanto_ai_ci NULL NULL NULL # # +uca1400_esperanto_ai_cs NULL NULL NULL # # +uca1400_esperanto_as_ci NULL NULL NULL # # +uca1400_esperanto_as_cs NULL NULL NULL # # +uca1400_esperanto_nopad_ai_ci NULL NULL NULL # # +uca1400_esperanto_nopad_ai_cs NULL NULL NULL # # +uca1400_esperanto_nopad_as_ci NULL NULL NULL # # +uca1400_esperanto_nopad_as_cs NULL NULL NULL # # +uca1400_hungarian_ai_ci NULL NULL NULL # # +uca1400_hungarian_ai_cs NULL NULL NULL # # +uca1400_hungarian_as_ci NULL NULL NULL # # +uca1400_hungarian_as_cs NULL NULL NULL # # +uca1400_hungarian_nopad_ai_ci NULL NULL NULL # # +uca1400_hungarian_nopad_ai_cs NULL NULL NULL # # +uca1400_hungarian_nopad_as_ci NULL NULL NULL # # +uca1400_hungarian_nopad_as_cs NULL NULL NULL # # +uca1400_sinhala_ai_ci NULL NULL NULL # # +uca1400_sinhala_ai_cs NULL NULL NULL # # +uca1400_sinhala_as_ci NULL NULL NULL # # +uca1400_sinhala_as_cs NULL NULL NULL # # +uca1400_sinhala_nopad_ai_ci NULL NULL NULL # # +uca1400_sinhala_nopad_ai_cs NULL NULL NULL # # +uca1400_sinhala_nopad_as_ci NULL NULL NULL # # +uca1400_sinhala_nopad_as_cs NULL NULL NULL # # +uca1400_german2_ai_ci NULL NULL NULL # # +uca1400_german2_ai_cs NULL NULL NULL # # +uca1400_german2_as_ci NULL NULL NULL # # +uca1400_german2_as_cs NULL NULL NULL # # +uca1400_german2_nopad_ai_ci NULL NULL NULL # # +uca1400_german2_nopad_ai_cs NULL NULL NULL # # +uca1400_german2_nopad_as_ci NULL NULL NULL # # +uca1400_german2_nopad_as_cs NULL NULL NULL # # +uca1400_vietnamese_ai_ci NULL NULL NULL # # +uca1400_vietnamese_ai_cs NULL NULL NULL # # +uca1400_vietnamese_as_ci NULL NULL NULL # # +uca1400_vietnamese_as_cs NULL NULL NULL # # +uca1400_vietnamese_nopad_ai_ci NULL NULL NULL # # +uca1400_vietnamese_nopad_ai_cs NULL NULL NULL # # +uca1400_vietnamese_nopad_as_ci NULL NULL NULL # # +uca1400_vietnamese_nopad_as_cs NULL NULL NULL # # +uca1400_croatian_ai_ci NULL NULL NULL # # +uca1400_croatian_ai_cs NULL NULL NULL # # +uca1400_croatian_as_ci NULL NULL NULL # # +uca1400_croatian_as_cs NULL NULL NULL # # +uca1400_croatian_nopad_ai_ci NULL NULL NULL # # +uca1400_croatian_nopad_ai_cs NULL NULL NULL # # +uca1400_croatian_nopad_as_ci NULL NULL NULL # # +uca1400_croatian_nopad_as_cs NULL NULL NULL # # cp1251_bulgarian_ci cp1251 14 # # cp1251_ukrainian_ci cp1251 23 # # cp1251_bin cp1251 50 # # diff --git a/mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result b/mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result index 6aa05538a32..0bc617071ca 100644 --- a/mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result +++ b/mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result @@ -224,6 +224,190 @@ utf8mb4_general_nopad_ci utf8mb4 1069 # # utf8mb4_nopad_bin utf8mb4 1070 # # utf8mb4_unicode_nopad_ci utf8mb4 1248 # # utf8mb4_unicode_520_nopad_ci utf8mb4 1270 # # +uca1400_ai_ci NULL NULL NULL # # +uca1400_ai_cs NULL NULL NULL # # +uca1400_as_ci NULL NULL NULL # # +uca1400_as_cs NULL NULL NULL # # +uca1400_nopad_ai_ci NULL NULL NULL # # +uca1400_nopad_ai_cs NULL NULL NULL # # +uca1400_nopad_as_ci NULL NULL NULL # # +uca1400_nopad_as_cs NULL NULL NULL # # +uca1400_icelandic_ai_ci NULL NULL NULL # # +uca1400_icelandic_ai_cs NULL NULL NULL # # +uca1400_icelandic_as_ci NULL NULL NULL # # +uca1400_icelandic_as_cs NULL NULL NULL # # +uca1400_icelandic_nopad_ai_ci NULL NULL NULL # # +uca1400_icelandic_nopad_ai_cs NULL NULL NULL # # +uca1400_icelandic_nopad_as_ci NULL NULL NULL # # +uca1400_icelandic_nopad_as_cs NULL NULL NULL # # +uca1400_latvian_ai_ci NULL NULL NULL # # +uca1400_latvian_ai_cs NULL NULL NULL # # +uca1400_latvian_as_ci NULL NULL NULL # # +uca1400_latvian_as_cs NULL NULL NULL # # +uca1400_latvian_nopad_ai_ci NULL NULL NULL # # +uca1400_latvian_nopad_ai_cs NULL NULL NULL # # +uca1400_latvian_nopad_as_ci NULL NULL NULL # # +uca1400_latvian_nopad_as_cs NULL NULL NULL # # +uca1400_romanian_ai_ci NULL NULL NULL # # +uca1400_romanian_ai_cs NULL NULL NULL # # +uca1400_romanian_as_ci NULL NULL NULL # # +uca1400_romanian_as_cs NULL NULL NULL # # +uca1400_romanian_nopad_ai_ci NULL NULL NULL # # +uca1400_romanian_nopad_ai_cs NULL NULL NULL # # +uca1400_romanian_nopad_as_ci NULL NULL NULL # # +uca1400_romanian_nopad_as_cs NULL NULL NULL # # +uca1400_slovenian_ai_ci NULL NULL NULL # # +uca1400_slovenian_ai_cs NULL NULL NULL # # +uca1400_slovenian_as_ci NULL NULL NULL # # +uca1400_slovenian_as_cs NULL NULL NULL # # +uca1400_slovenian_nopad_ai_ci NULL NULL NULL # # +uca1400_slovenian_nopad_ai_cs NULL NULL NULL # # +uca1400_slovenian_nopad_as_ci NULL NULL NULL # # +uca1400_slovenian_nopad_as_cs NULL NULL NULL # # +uca1400_polish_ai_ci NULL NULL NULL # # +uca1400_polish_ai_cs NULL NULL NULL # # +uca1400_polish_as_ci NULL NULL NULL # # +uca1400_polish_as_cs NULL NULL NULL # # +uca1400_polish_nopad_ai_ci NULL NULL NULL # # +uca1400_polish_nopad_ai_cs NULL NULL NULL # # +uca1400_polish_nopad_as_ci NULL NULL NULL # # +uca1400_polish_nopad_as_cs NULL NULL NULL # # +uca1400_estonian_ai_ci NULL NULL NULL # # +uca1400_estonian_ai_cs NULL NULL NULL # # +uca1400_estonian_as_ci NULL NULL NULL # # +uca1400_estonian_as_cs NULL NULL NULL # # +uca1400_estonian_nopad_ai_ci NULL NULL NULL # # +uca1400_estonian_nopad_ai_cs NULL NULL NULL # # +uca1400_estonian_nopad_as_ci NULL NULL NULL # # +uca1400_estonian_nopad_as_cs NULL NULL NULL # # +uca1400_spanish_ai_ci NULL NULL NULL # # +uca1400_spanish_ai_cs NULL NULL NULL # # +uca1400_spanish_as_ci NULL NULL NULL # # +uca1400_spanish_as_cs NULL NULL NULL # # +uca1400_spanish_nopad_ai_ci NULL NULL NULL # # +uca1400_spanish_nopad_ai_cs NULL NULL NULL # # +uca1400_spanish_nopad_as_ci NULL NULL NULL # # +uca1400_spanish_nopad_as_cs NULL NULL NULL # # +uca1400_swedish_ai_ci NULL NULL NULL # # +uca1400_swedish_ai_cs NULL NULL NULL # # +uca1400_swedish_as_ci NULL NULL NULL # # +uca1400_swedish_as_cs NULL NULL NULL # # +uca1400_swedish_nopad_ai_ci NULL NULL NULL # # +uca1400_swedish_nopad_ai_cs NULL NULL NULL # # +uca1400_swedish_nopad_as_ci NULL NULL NULL # # +uca1400_swedish_nopad_as_cs NULL NULL NULL # # +uca1400_turkish_ai_ci NULL NULL NULL # # +uca1400_turkish_ai_cs NULL NULL NULL # # +uca1400_turkish_as_ci NULL NULL NULL # # +uca1400_turkish_as_cs NULL NULL NULL # # +uca1400_turkish_nopad_ai_ci NULL NULL NULL # # +uca1400_turkish_nopad_ai_cs NULL NULL NULL # # +uca1400_turkish_nopad_as_ci NULL NULL NULL # # +uca1400_turkish_nopad_as_cs NULL NULL NULL # # +uca1400_czech_ai_ci NULL NULL NULL # # +uca1400_czech_ai_cs NULL NULL NULL # # +uca1400_czech_as_ci NULL NULL NULL # # +uca1400_czech_as_cs NULL NULL NULL # # +uca1400_czech_nopad_ai_ci NULL NULL NULL # # +uca1400_czech_nopad_ai_cs NULL NULL NULL # # +uca1400_czech_nopad_as_ci NULL NULL NULL # # +uca1400_czech_nopad_as_cs NULL NULL NULL # # +uca1400_danish_ai_ci NULL NULL NULL # # +uca1400_danish_ai_cs NULL NULL NULL # # +uca1400_danish_as_ci NULL NULL NULL # # +uca1400_danish_as_cs NULL NULL NULL # # +uca1400_danish_nopad_ai_ci NULL NULL NULL # # +uca1400_danish_nopad_ai_cs NULL NULL NULL # # +uca1400_danish_nopad_as_ci NULL NULL NULL # # +uca1400_danish_nopad_as_cs NULL NULL NULL # # +uca1400_lithuanian_ai_ci NULL NULL NULL # # +uca1400_lithuanian_ai_cs NULL NULL NULL # # +uca1400_lithuanian_as_ci NULL NULL NULL # # +uca1400_lithuanian_as_cs NULL NULL NULL # # +uca1400_lithuanian_nopad_ai_ci NULL NULL NULL # # +uca1400_lithuanian_nopad_ai_cs NULL NULL NULL # # +uca1400_lithuanian_nopad_as_ci NULL NULL NULL # # +uca1400_lithuanian_nopad_as_cs NULL NULL NULL # # +uca1400_slovak_ai_ci NULL NULL NULL # # +uca1400_slovak_ai_cs NULL NULL NULL # # +uca1400_slovak_as_ci NULL NULL NULL # # +uca1400_slovak_as_cs NULL NULL NULL # # +uca1400_slovak_nopad_ai_ci NULL NULL NULL # # +uca1400_slovak_nopad_ai_cs NULL NULL NULL # # +uca1400_slovak_nopad_as_ci NULL NULL NULL # # +uca1400_slovak_nopad_as_cs NULL NULL NULL # # +uca1400_spanish2_ai_ci NULL NULL NULL # # +uca1400_spanish2_ai_cs NULL NULL NULL # # +uca1400_spanish2_as_ci NULL NULL NULL # # +uca1400_spanish2_as_cs NULL NULL NULL # # +uca1400_spanish2_nopad_ai_ci NULL NULL NULL # # +uca1400_spanish2_nopad_ai_cs NULL NULL NULL # # +uca1400_spanish2_nopad_as_ci NULL NULL NULL # # +uca1400_spanish2_nopad_as_cs NULL NULL NULL # # +uca1400_roman_ai_ci NULL NULL NULL # # +uca1400_roman_ai_cs NULL NULL NULL # # +uca1400_roman_as_ci NULL NULL NULL # # +uca1400_roman_as_cs NULL NULL NULL # # +uca1400_roman_nopad_ai_ci NULL NULL NULL # # +uca1400_roman_nopad_ai_cs NULL NULL NULL # # +uca1400_roman_nopad_as_ci NULL NULL NULL # # +uca1400_roman_nopad_as_cs NULL NULL NULL # # +uca1400_persian_ai_ci NULL NULL NULL # # +uca1400_persian_ai_cs NULL NULL NULL # # +uca1400_persian_as_ci NULL NULL NULL # # +uca1400_persian_as_cs NULL NULL NULL # # +uca1400_persian_nopad_ai_ci NULL NULL NULL # # +uca1400_persian_nopad_ai_cs NULL NULL NULL # # +uca1400_persian_nopad_as_ci NULL NULL NULL # # +uca1400_persian_nopad_as_cs NULL NULL NULL # # +uca1400_esperanto_ai_ci NULL NULL NULL # # +uca1400_esperanto_ai_cs NULL NULL NULL # # +uca1400_esperanto_as_ci NULL NULL NULL # # +uca1400_esperanto_as_cs NULL NULL NULL # # +uca1400_esperanto_nopad_ai_ci NULL NULL NULL # # +uca1400_esperanto_nopad_ai_cs NULL NULL NULL # # +uca1400_esperanto_nopad_as_ci NULL NULL NULL # # +uca1400_esperanto_nopad_as_cs NULL NULL NULL # # +uca1400_hungarian_ai_ci NULL NULL NULL # # +uca1400_hungarian_ai_cs NULL NULL NULL # # +uca1400_hungarian_as_ci NULL NULL NULL # # +uca1400_hungarian_as_cs NULL NULL NULL # # +uca1400_hungarian_nopad_ai_ci NULL NULL NULL # # +uca1400_hungarian_nopad_ai_cs NULL NULL NULL # # +uca1400_hungarian_nopad_as_ci NULL NULL NULL # # +uca1400_hungarian_nopad_as_cs NULL NULL NULL # # +uca1400_sinhala_ai_ci NULL NULL NULL # # +uca1400_sinhala_ai_cs NULL NULL NULL # # +uca1400_sinhala_as_ci NULL NULL NULL # # +uca1400_sinhala_as_cs NULL NULL NULL # # +uca1400_sinhala_nopad_ai_ci NULL NULL NULL # # +uca1400_sinhala_nopad_ai_cs NULL NULL NULL # # +uca1400_sinhala_nopad_as_ci NULL NULL NULL # # +uca1400_sinhala_nopad_as_cs NULL NULL NULL # # +uca1400_german2_ai_ci NULL NULL NULL # # +uca1400_german2_ai_cs NULL NULL NULL # # +uca1400_german2_as_ci NULL NULL NULL # # +uca1400_german2_as_cs NULL NULL NULL # # +uca1400_german2_nopad_ai_ci NULL NULL NULL # # +uca1400_german2_nopad_ai_cs NULL NULL NULL # # +uca1400_german2_nopad_as_ci NULL NULL NULL # # +uca1400_german2_nopad_as_cs NULL NULL NULL # # +uca1400_vietnamese_ai_ci NULL NULL NULL # # +uca1400_vietnamese_ai_cs NULL NULL NULL # # +uca1400_vietnamese_as_ci NULL NULL NULL # # +uca1400_vietnamese_as_cs NULL NULL NULL # # +uca1400_vietnamese_nopad_ai_ci NULL NULL NULL # # +uca1400_vietnamese_nopad_ai_cs NULL NULL NULL # # +uca1400_vietnamese_nopad_as_ci NULL NULL NULL # # +uca1400_vietnamese_nopad_as_cs NULL NULL NULL # # +uca1400_croatian_ai_ci NULL NULL NULL # # +uca1400_croatian_ai_cs NULL NULL NULL # # +uca1400_croatian_as_ci NULL NULL NULL # # +uca1400_croatian_as_cs NULL NULL NULL # # +uca1400_croatian_nopad_ai_ci NULL NULL NULL # # +uca1400_croatian_nopad_ai_cs NULL NULL NULL # # +uca1400_croatian_nopad_as_ci NULL NULL NULL # # +uca1400_croatian_nopad_as_cs NULL NULL NULL # # cp1251_bulgarian_ci cp1251 14 # # cp1251_ukrainian_ci cp1251 23 # # cp1251_bin cp1251 50 # # diff --git a/mysql-test/suite/engines/funcs/r/ix_index_non_string.result b/mysql-test/suite/engines/funcs/r/ix_index_non_string.result index 84777236ddb..f56fe4f83f4 100644 --- a/mysql-test/suite/engines/funcs/r/ix_index_non_string.result +++ b/mysql-test/suite/engines/funcs/r/ix_index_non_string.result @@ -427,7 +427,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; diff --git a/mysql-test/suite/engines/funcs/r/ix_unique_non_string.result b/mysql-test/suite/engines/funcs/r/ix_unique_non_string.result index b99751d9f6c..9f10a9bfb13 100644 --- a/mysql-test/suite/engines/funcs/r/ix_unique_non_string.result +++ b/mysql-test/suite/engines/funcs/r/ix_unique_non_string.result @@ -427,7 +427,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; diff --git a/mysql-test/suite/engines/funcs/r/rpl_000010.result b/mysql-test/suite/engines/funcs/r/rpl_000010.result index ae989f25e1b..a86d71bd33f 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_000010.result +++ b/mysql-test/suite/engines/funcs/r/rpl_000010.result @@ -1,5 +1,10 @@ include/master-slave.inc [connection master] +connection slave; +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc +connection master; create table t1 (n int not null auto_increment primary key); insert into t1 values(NULL); insert into t1 values(2); diff --git a/mysql-test/suite/engines/funcs/r/rpl_change_master.result b/mysql-test/suite/engines/funcs/r/rpl_change_master.result index 48cec72d917..88801b07bba 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_change_master.result +++ b/mysql-test/suite/engines/funcs/r/rpl_change_master.result @@ -26,4 +26,9 @@ connection master; CHANGE MASTER TO MASTER_USER='root', MASTER_SSL=0, MASTER_SSL_CA='', MASTER_SSL_CERT='', MASTER_SSL_KEY='', MASTER_SSL_CRL='', MASTER_SSL_CRLPATH=''; CHANGE MASTER TO MASTER_USER='root', MASTER_PASSWORD='', MASTER_SSL=0; +"Usage of CURRENT_POS in CHANGE MASTER MASTER_USE_GTID is dreprecated. +CHANGE MASTER TO MASTER_USE_GTID=CURRENT_POS; +Warnings: +Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead +CHANGE MASTER TO MASTER_USE_GTID=SLAVE_POS; include/rpl_end.inc diff --git a/mysql-test/suite/engines/funcs/r/rpl_log_pos.result b/mysql-test/suite/engines/funcs/r/rpl_log_pos.result index 7f5f34bf831..74080b3936f 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_log_pos.result +++ b/mysql-test/suite/engines/funcs/r/rpl_log_pos.result @@ -9,7 +9,7 @@ File Position Binlog_Do_DB Binlog_Ignore_DB master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB> connection slave; include/stop_slave.inc -change master to master_log_pos=MASTER_LOG_POS; +change master to master_log_pos=MASTER_LOG_POS, master_use_gtid=no; start slave; include/wait_for_slave_io_error.inc [errno=1236] Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'binlog truncated in the middle of event; consider out of disk space on master; the first event 'master-bin.000001' at XXX, the last event read from 'master-bin.000001' at XXX, the last byte read from 'master-bin.000001' at XXX.'' @@ -23,7 +23,7 @@ drop table if exists t1; create table t1 (n int); insert into t1 values (1),(2),(3); connection slave; -change master to master_log_pos=MASTER_LOG_POS; +change master to master_log_pos=MASTER_LOG_POS, master_use_gtid=no; start slave; select * from t1 ORDER BY n; n diff --git a/mysql-test/suite/engines/funcs/r/rpl_row_reset_slave.result b/mysql-test/suite/engines/funcs/r/rpl_row_reset_slave.result index b9e98d5a97d..5e595447e50 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_row_reset_slave.result +++ b/mysql-test/suite/engines/funcs/r/rpl_row_reset_slave.result @@ -7,7 +7,7 @@ include/stop_slave.inc change master to master_user='test'; Master_User = 'test' Master_Host = '127.0.0.1' -reset slave; +include/reset_slave.inc Master_User = 'test' Master_Host = '127.0.0.1' change master to master_user='root'; @@ -15,13 +15,13 @@ include/start_slave.inc Master_User = 'root' Master_Host = '127.0.0.1' include/stop_slave.inc -reset slave; +include/reset_slave.inc include/start_slave.inc connection master; create temporary table t1 (a int); connection slave; include/stop_slave.inc -reset slave; +include/reset_slave.inc include/start_slave.inc show status like 'slave_open_temp_tables'; Variable_name Value @@ -30,7 +30,7 @@ connection master; drop temporary table if exists t1; connection slave; include/stop_slave.inc -reset slave; +include/reset_slave.inc include/check_slave_no_error.inc change master to master_user='impossible_user_name'; start slave; @@ -44,13 +44,14 @@ change master to master_user='impossible_user_name'; start slave; include/wait_for_slave_io_error.inc [errno=1045] include/stop_slave_sql.inc -reset slave; +include/reset_slave.inc include/check_slave_no_error.inc change master to master_user='root'; -reset slave; +include/reset_slave.inc include/start_slave.inc include/stop_slave.inc reset slave all; +set @@global.gtid_slave_pos= ""; start slave; ERROR HY000: Misconfigured slave: MASTER_HOST was not set; Fix in config file or with CHANGE MASTER TO CHANGE MASTER TO MASTER_HOST= 'MASTER_HOST', MASTER_USER= 'MASTER_USER', MASTER_PORT= MASTER_PORT; diff --git a/mysql-test/suite/engines/funcs/r/rpl_row_until.result b/mysql-test/suite/engines/funcs/r/rpl_row_until.result index 82268ce72eb..8ef10bf47b5 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_row_until.result +++ b/mysql-test/suite/engines/funcs/r/rpl_row_until.result @@ -10,7 +10,7 @@ INSERT INTO t2 VALUES (3),(4); DROP TABLE t2; connection slave; include/stop_slave.inc -RESET SLAVE; +include/reset_slave.inc CHANGE MASTER TO MASTER_USER='root', MASTER_CONNECT_RETRY=1, MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_MYPORT; connection slave; START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=master_pos_drop_t1; @@ -52,7 +52,7 @@ START SLAVE UNTIL RELAY_LOG_FILE='slave-relay-bin.000002', MASTER_LOG_POS=MASTER ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=MASTER_LOG_POS; include/stop_slave.inc -RESET SLAVE; +include/reset_slave.inc include/start_slave.inc include/rpl_reset.inc connection master; diff --git a/mysql-test/suite/engines/funcs/r/rpl_server_id2.result b/mysql-test/suite/engines/funcs/r/rpl_server_id2.result index 74145645920..3d8eeb02ca6 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_server_id2.result +++ b/mysql-test/suite/engines/funcs/r/rpl_server_id2.result @@ -1,6 +1,9 @@ include/master-slave.inc [connection master] connection slave; +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc create table t1 (n int); reset master; stop slave; diff --git a/mysql-test/suite/engines/funcs/r/rpl_sp.result b/mysql-test/suite/engines/funcs/r/rpl_sp.result index d158fe8bfd6..264a1505275 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_sp.result +++ b/mysql-test/suite/engines/funcs/r/rpl_sp.result @@ -771,7 +771,7 @@ DELIMITER /*!*/; ROLLBACK/*!*/; SET TIMESTAMP=t/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/engines/funcs/r/rpl_stm_reset_slave.result b/mysql-test/suite/engines/funcs/r/rpl_stm_reset_slave.result index 1ba2d1b624b..0a365b30b38 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_stm_reset_slave.result +++ b/mysql-test/suite/engines/funcs/r/rpl_stm_reset_slave.result @@ -7,7 +7,7 @@ include/stop_slave.inc change master to master_user='test'; Master_User = 'test' Master_Host = '127.0.0.1' -reset slave; +include/reset_slave.inc Master_User = 'test' Master_Host = '127.0.0.1' change master to master_user='root'; @@ -15,13 +15,13 @@ include/start_slave.inc Master_User = 'root' Master_Host = '127.0.0.1' include/stop_slave.inc -reset slave; +include/reset_slave.inc include/start_slave.inc connection master; create temporary table t1 (a int); connection slave; include/stop_slave.inc -reset slave; +include/reset_slave.inc include/start_slave.inc show status like 'slave_open_temp_tables'; Variable_name Value @@ -30,7 +30,7 @@ connection master; drop temporary table if exists t1; connection slave; include/stop_slave.inc -reset slave; +include/reset_slave.inc include/check_slave_no_error.inc change master to master_user='impossible_user_name'; start slave; @@ -44,13 +44,14 @@ change master to master_user='impossible_user_name'; start slave; include/wait_for_slave_io_error.inc [errno=1045] include/stop_slave_sql.inc -reset slave; +include/reset_slave.inc include/check_slave_no_error.inc change master to master_user='root'; -reset slave; +include/reset_slave.inc include/start_slave.inc include/stop_slave.inc reset slave all; +set @@global.gtid_slave_pos= ""; start slave; ERROR HY000: Misconfigured slave: MASTER_HOST was not set; Fix in config file or with CHANGE MASTER TO CHANGE MASTER TO MASTER_HOST= 'MASTER_HOST', MASTER_USER= 'MASTER_USER', MASTER_PORT= MASTER_PORT; diff --git a/mysql-test/suite/engines/funcs/r/rpl_trigger.result b/mysql-test/suite/engines/funcs/r/rpl_trigger.result index b5b88670fc6..3913508d032 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_trigger.result +++ b/mysql-test/suite/engines/funcs/r/rpl_trigger.result @@ -1,5 +1,10 @@ include/master-slave.inc [connection master] +connection slave; +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc +connection master; call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); create table t1 (a int auto_increment, primary key (a), b int, rand_value double not null); create table t2 (a int auto_increment, primary key (a), b int); @@ -960,7 +965,9 @@ include/rpl_stop_server.inc [server_number=1] include/rpl_start_server.inc [server_number=1] --> Master binlog: Server ver: 5.0.16-debug-log, Binlog ver: 4 connection slave; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' include/start_slave.inc SELECT MASTER_POS_WAIT('master-bin.000001', 513) >= 0; MASTER_POS_WAIT('master-bin.000001', 513) >= 0 @@ -991,7 +998,9 @@ DROP TRIGGER trg1; DROP TABLE t1; DROP TABLE t2; include/stop_slave.inc -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' connection master; SHOW TABLES LIKE 't_'; Tables_in_test (t_) diff --git a/mysql-test/suite/engines/funcs/r/ta_2part_column_to_pk.result b/mysql-test/suite/engines/funcs/r/ta_2part_column_to_pk.result index 626c5a6de45..43178243129 100644 --- a/mysql-test/suite/engines/funcs/r/ta_2part_column_to_pk.result +++ b/mysql-test/suite/engines/funcs/r/ta_2part_column_to_pk.result @@ -342,8 +342,8 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' + `c1` timestamp NOT NULL, + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2); SHOW TABLES; @@ -352,8 +352,8 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c1` timestamp NOT NULL, + `c2` timestamp NOT NULL, PRIMARY KEY (`c1`,`c2`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; diff --git a/mysql-test/suite/engines/funcs/r/ta_2part_diff_to_pk.result b/mysql-test/suite/engines/funcs/r/ta_2part_diff_to_pk.result index 54f83cfad51..ec163b21e57 100644 --- a/mysql-test/suite/engines/funcs/r/ta_2part_diff_to_pk.result +++ b/mysql-test/suite/engines/funcs/r/ta_2part_diff_to_pk.result @@ -398,7 +398,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` bit(1) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -410,7 +410,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` bit(1) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -846,7 +846,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` tinyint(4) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -858,7 +858,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` tinyint(4) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -1294,7 +1294,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` smallint(6) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -1306,7 +1306,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` smallint(6) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -1742,7 +1742,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` mediumint(9) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -1754,7 +1754,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` mediumint(9) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -2190,7 +2190,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -2202,7 +2202,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -2638,7 +2638,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -2650,7 +2650,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -3086,7 +3086,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` bigint(20) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -3098,7 +3098,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` bigint(20) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -3534,7 +3534,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` double NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -3546,7 +3546,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` double NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -3982,7 +3982,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` double NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -3994,7 +3994,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` double NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -4430,7 +4430,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` float NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -4442,7 +4442,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` float NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -4878,7 +4878,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` decimal(10,0) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -4890,7 +4890,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` decimal(10,0) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -5326,7 +5326,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` decimal(10,0) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -5338,7 +5338,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` decimal(10,0) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -5774,7 +5774,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` date NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -5786,7 +5786,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` date NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -6222,7 +6222,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` time NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -6234,7 +6234,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` time NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -6279,7 +6279,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` bit(1) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -6291,7 +6291,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` bit(1) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6307,7 +6307,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -6319,7 +6319,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6335,7 +6335,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -6347,7 +6347,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6363,7 +6363,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -6375,7 +6375,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6391,7 +6391,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -6403,7 +6403,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6419,7 +6419,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -6431,7 +6431,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6447,7 +6447,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -6459,7 +6459,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6475,7 +6475,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` double NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -6487,7 +6487,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` double NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6503,7 +6503,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` double NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -6515,7 +6515,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` double NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6531,7 +6531,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` float NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -6543,7 +6543,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` float NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6559,7 +6559,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` decimal(10,0) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -6571,7 +6571,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` decimal(10,0) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6587,7 +6587,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` decimal(10,0) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -6599,7 +6599,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` decimal(10,0) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6615,7 +6615,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` date NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -6627,7 +6627,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` date NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6643,7 +6643,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` time NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -6655,7 +6655,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` time NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6670,8 +6670,8 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c1` timestamp NOT NULL, + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -6682,8 +6682,8 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c1` timestamp NOT NULL, + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6699,7 +6699,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` year(4) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -6711,7 +6711,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` year(4) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -7118,7 +7118,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` year(4) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -7130,7 +7130,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` year(4) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, diff --git a/mysql-test/suite/engines/funcs/r/ta_3part_column_to_pk.result b/mysql-test/suite/engines/funcs/r/ta_3part_column_to_pk.result index b0eab6dc214..dda36fa2fb0 100644 --- a/mysql-test/suite/engines/funcs/r/ta_3part_column_to_pk.result +++ b/mysql-test/suite/engines/funcs/r/ta_3part_column_to_pk.result @@ -370,9 +370,9 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' + `c1` timestamp NOT NULL, + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1,c2,c3); SHOW TABLES; @@ -381,9 +381,9 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c1` timestamp NOT NULL, + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`,`c2`,`c3`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; diff --git a/mysql-test/suite/engines/funcs/r/ta_add_column.result b/mysql-test/suite/engines/funcs/r/ta_add_column.result index 063f41c62e6..43212cec556 100644 --- a/mysql-test/suite/engines/funcs/r/ta_add_column.result +++ b/mysql-test/suite/engines/funcs/r/ta_add_column.result @@ -842,7 +842,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 BIT NOT NULL; SHOW TABLES; @@ -851,7 +851,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` bit(1) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -1898,7 +1898,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 TINYINT NOT NULL; SHOW TABLES; @@ -1907,7 +1907,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` tinyint(4) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -2954,7 +2954,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 SMALLINT NOT NULL; SHOW TABLES; @@ -2963,7 +2963,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` smallint(6) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -4010,7 +4010,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 MEDIUMINT NOT NULL; SHOW TABLES; @@ -4019,7 +4019,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` mediumint(9) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -5066,7 +5066,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 INT NOT NULL; SHOW TABLES; @@ -5075,7 +5075,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -6122,7 +6122,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 INTEGER NOT NULL; SHOW TABLES; @@ -6131,7 +6131,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -7178,7 +7178,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 BIGINT NOT NULL; SHOW TABLES; @@ -7187,7 +7187,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` bigint(20) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -8234,7 +8234,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 REAL NOT NULL; SHOW TABLES; @@ -8243,7 +8243,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` double NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -9290,7 +9290,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 DOUBLE NOT NULL; SHOW TABLES; @@ -9299,7 +9299,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` double NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -10346,7 +10346,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 FLOAT NOT NULL; SHOW TABLES; @@ -10355,7 +10355,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` float NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -11402,7 +11402,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 DECIMAL NOT NULL; SHOW TABLES; @@ -11411,7 +11411,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` decimal(10,0) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -12458,7 +12458,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 NUMERIC NOT NULL; SHOW TABLES; @@ -12467,7 +12467,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` decimal(10,0) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -13514,7 +13514,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 DATE NOT NULL; SHOW TABLES; @@ -13523,7 +13523,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` date NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -14570,7 +14570,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 TIME NOT NULL; SHOW TABLES; @@ -14579,7 +14579,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` time NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -15328,7 +15328,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` bit(1) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -15350,7 +15350,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -15372,7 +15372,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -15394,7 +15394,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -15416,7 +15416,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -15438,7 +15438,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -15460,7 +15460,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -15482,7 +15482,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` double NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -15504,7 +15504,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` double NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -15526,7 +15526,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` float NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -15548,7 +15548,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` decimal(10,0) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -15570,7 +15570,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` decimal(10,0) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -15592,7 +15592,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` date NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -15614,7 +15614,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` time NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -15626,7 +15626,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 TIMESTAMP NOT NULL; SHOW TABLES; @@ -15635,8 +15635,8 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' + `c1` timestamp NOT NULL, + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -15658,7 +15658,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` year(4) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -15680,7 +15680,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` tinyblob NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -15702,7 +15702,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` blob NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -15724,7 +15724,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` mediumblob NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -15746,7 +15746,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` longblob NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -15768,7 +15768,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` tinytext NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -15790,7 +15790,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` text NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -15812,7 +15812,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` mediumtext NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -15834,7 +15834,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` longtext NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -16682,7 +16682,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 YEAR NOT NULL; SHOW TABLES; @@ -16691,7 +16691,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` year(4) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -17738,7 +17738,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 TINYBLOB NOT NULL; SHOW TABLES; @@ -17747,7 +17747,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` tinyblob NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -18794,7 +18794,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 BLOB NOT NULL; SHOW TABLES; @@ -18803,7 +18803,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` blob NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -19850,7 +19850,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 MEDIUMBLOB NOT NULL; SHOW TABLES; @@ -19859,7 +19859,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` mediumblob NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -20906,7 +20906,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 LONGBLOB NOT NULL; SHOW TABLES; @@ -20915,7 +20915,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` longblob NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -21962,7 +21962,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 TINYTEXT NOT NULL; SHOW TABLES; @@ -21971,7 +21971,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` tinytext NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -23018,7 +23018,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 TEXT NOT NULL; SHOW TABLES; @@ -23027,7 +23027,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` text NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -24074,7 +24074,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 MEDIUMTEXT NOT NULL; SHOW TABLES; @@ -24083,7 +24083,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` mediumtext NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -25130,7 +25130,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 LONGTEXT NOT NULL; SHOW TABLES; @@ -25139,7 +25139,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` longtext NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; diff --git a/mysql-test/suite/engines/funcs/r/ta_add_column2.result b/mysql-test/suite/engines/funcs/r/ta_add_column2.result index 79afc094045..9ff6012049d 100644 --- a/mysql-test/suite/engines/funcs/r/ta_add_column2.result +++ b/mysql-test/suite/engines/funcs/r/ta_add_column2.result @@ -2568,7 +2568,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` char(15) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -2590,7 +2590,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` varchar(15) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -2612,7 +2612,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` binary(15) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -2634,7 +2634,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` varbinary(15) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/ta_add_column_first.result b/mysql-test/suite/engines/funcs/r/ta_add_column_first.result index d0657802547..a968cf4d034 100644 --- a/mysql-test/suite/engines/funcs/r/ta_add_column_first.result +++ b/mysql-test/suite/engines/funcs/r/ta_add_column_first.result @@ -842,7 +842,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 BIT NOT NULL FIRST; SHOW TABLES; @@ -852,7 +852,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` bit(1) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -1898,7 +1898,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 TINYINT NOT NULL FIRST; SHOW TABLES; @@ -1908,7 +1908,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` tinyint(4) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -2954,7 +2954,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 SMALLINT NOT NULL FIRST; SHOW TABLES; @@ -2964,7 +2964,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` smallint(6) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -4010,7 +4010,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 MEDIUMINT NOT NULL FIRST; SHOW TABLES; @@ -4020,7 +4020,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` mediumint(9) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -5066,7 +5066,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 INT NOT NULL FIRST; SHOW TABLES; @@ -5076,7 +5076,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` int(11) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -6122,7 +6122,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 INTEGER NOT NULL FIRST; SHOW TABLES; @@ -6132,7 +6132,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` int(11) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -7178,7 +7178,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 BIGINT NOT NULL FIRST; SHOW TABLES; @@ -7188,7 +7188,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` bigint(20) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -8234,7 +8234,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 REAL NOT NULL FIRST; SHOW TABLES; @@ -8244,7 +8244,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` double NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -9290,7 +9290,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 DOUBLE NOT NULL FIRST; SHOW TABLES; @@ -9300,7 +9300,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` double NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -10346,7 +10346,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 FLOAT NOT NULL FIRST; SHOW TABLES; @@ -10356,7 +10356,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` float NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -11402,7 +11402,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 DECIMAL NOT NULL FIRST; SHOW TABLES; @@ -11412,7 +11412,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` decimal(10,0) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -12458,7 +12458,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 NUMERIC NOT NULL FIRST; SHOW TABLES; @@ -12468,7 +12468,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` decimal(10,0) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -13514,7 +13514,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 DATE NOT NULL FIRST; SHOW TABLES; @@ -13524,7 +13524,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` date NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -14570,7 +14570,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 TIME NOT NULL FIRST; SHOW TABLES; @@ -14580,7 +14580,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` time NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -15626,7 +15626,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 YEAR NOT NULL FIRST; SHOW TABLES; @@ -15636,7 +15636,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` year(4) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -16682,7 +16682,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 TINYBLOB NOT NULL FIRST; SHOW TABLES; @@ -16692,7 +16692,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` tinyblob NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -17738,7 +17738,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 BLOB NOT NULL FIRST; SHOW TABLES; @@ -17748,7 +17748,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` blob NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -18794,7 +18794,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 MEDIUMBLOB NOT NULL FIRST; SHOW TABLES; @@ -18804,7 +18804,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` mediumblob NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -19850,7 +19850,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 LONGBLOB NOT NULL FIRST; SHOW TABLES; @@ -19860,7 +19860,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` longblob NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -20906,7 +20906,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 TINYTEXT NOT NULL FIRST; SHOW TABLES; @@ -20916,7 +20916,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` tinytext NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -21962,7 +21962,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 TEXT NOT NULL FIRST; SHOW TABLES; @@ -21972,7 +21972,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` text NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -23018,7 +23018,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 MEDIUMTEXT NOT NULL FIRST; SHOW TABLES; @@ -23028,7 +23028,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` mediumtext NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -24074,7 +24074,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c2 LONGTEXT NOT NULL FIRST; SHOW TABLES; @@ -24084,7 +24084,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` longtext NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/ta_add_column_first2.result b/mysql-test/suite/engines/funcs/r/ta_add_column_first2.result index 406729e93dd..0810d21c259 100644 --- a/mysql-test/suite/engines/funcs/r/ta_add_column_first2.result +++ b/mysql-test/suite/engines/funcs/r/ta_add_column_first2.result @@ -2567,7 +2567,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c1` char(15) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -2589,7 +2589,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c1` varchar(15) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -2611,7 +2611,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c1` binary(15) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -2633,7 +2633,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c1` varbinary(15) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; diff --git a/mysql-test/suite/engines/funcs/r/ta_add_column_middle.result b/mysql-test/suite/engines/funcs/r/ta_add_column_middle.result index 014c7ae6486..5473812d7d5 100644 --- a/mysql-test/suite/engines/funcs/r/ta_add_column_middle.result +++ b/mysql-test/suite/engines/funcs/r/ta_add_column_middle.result @@ -1071,8 +1071,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c4 BIT NOT NULL AFTER c2; @@ -1083,9 +1083,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` bit(1) NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -2415,8 +2415,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c4 TINYINT NOT NULL AFTER c2; @@ -2427,9 +2427,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` tinyint(4) NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -3759,8 +3759,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c4 SMALLINT NOT NULL AFTER c2; @@ -3771,9 +3771,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` smallint(6) NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -5103,8 +5103,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c4 MEDIUMINT NOT NULL AFTER c2; @@ -5115,9 +5115,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` mediumint(9) NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -6447,8 +6447,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c4 INT NOT NULL AFTER c2; @@ -6459,9 +6459,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` int(11) NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -7791,8 +7791,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c4 INTEGER NOT NULL AFTER c2; @@ -7803,9 +7803,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` int(11) NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -9135,8 +9135,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c4 BIGINT NOT NULL AFTER c2; @@ -9147,9 +9147,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` bigint(20) NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -10479,8 +10479,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c4 REAL NOT NULL AFTER c2; @@ -10491,9 +10491,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` double NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -11823,8 +11823,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c4 DOUBLE NOT NULL AFTER c2; @@ -11835,9 +11835,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` double NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -13167,8 +13167,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c4 FLOAT NOT NULL AFTER c2; @@ -13179,9 +13179,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` float NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -14511,8 +14511,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c4 DECIMAL NOT NULL AFTER c2; @@ -14523,9 +14523,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` decimal(10,0) NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -15855,8 +15855,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c4 NUMERIC NOT NULL AFTER c2; @@ -15867,9 +15867,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` decimal(10,0) NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -17199,8 +17199,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c4 DATE NOT NULL AFTER c2; @@ -17211,9 +17211,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` date NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -18543,8 +18543,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c4 TIME NOT NULL AFTER c2; @@ -18555,9 +18555,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` time NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -19508,7 +19508,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` bit(1) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` bit(1) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -19536,7 +19536,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` tinyint(4) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` tinyint(4) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -19564,7 +19564,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` smallint(6) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` smallint(6) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -19592,7 +19592,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` mediumint(9) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` mediumint(9) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -19620,7 +19620,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` int(11) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` int(11) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -19648,7 +19648,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` int(11) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` int(11) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -19676,7 +19676,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` bigint(20) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` bigint(20) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -19704,7 +19704,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` double NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` double NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -19732,7 +19732,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` double NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` double NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -19760,7 +19760,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` float NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` float NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -19788,7 +19788,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` decimal(10,0) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` decimal(10,0) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -19816,7 +19816,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` decimal(10,0) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` decimal(10,0) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -19844,7 +19844,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` date NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` date NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -19872,7 +19872,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` time NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` time NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -19887,8 +19887,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c4 TIMESTAMP NOT NULL AFTER c2; @@ -19899,9 +19899,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c4` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c4` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -19928,7 +19928,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` year(4) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` year(4) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -19956,7 +19956,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` tinyblob NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` tinyblob NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -19984,7 +19984,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` blob NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` blob NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -20012,7 +20012,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` mediumblob NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` mediumblob NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -20040,7 +20040,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` longblob NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` longblob NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -20068,7 +20068,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` tinytext NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` tinytext NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -20096,7 +20096,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` text NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` text NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -20124,7 +20124,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` mediumtext NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` mediumtext NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -20152,7 +20152,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` longtext NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` longtext NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -21231,8 +21231,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c4 YEAR NOT NULL AFTER c2; @@ -21243,9 +21243,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` year(4) NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -22575,8 +22575,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c4 TINYBLOB NOT NULL AFTER c2; @@ -22587,9 +22587,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` tinyblob NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -23919,8 +23919,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c4 BLOB NOT NULL AFTER c2; @@ -23931,9 +23931,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` blob NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -25263,8 +25263,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c4 MEDIUMBLOB NOT NULL AFTER c2; @@ -25275,9 +25275,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` mediumblob NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -26607,8 +26607,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c4 LONGBLOB NOT NULL AFTER c2; @@ -26619,9 +26619,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` longblob NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -27951,8 +27951,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c4 TINYTEXT NOT NULL AFTER c2; @@ -27963,9 +27963,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` tinytext NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -29295,8 +29295,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c4 TEXT NOT NULL AFTER c2; @@ -29307,9 +29307,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` text NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -30639,8 +30639,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c4 MEDIUMTEXT NOT NULL AFTER c2; @@ -30651,9 +30651,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` mediumtext NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -31983,8 +31983,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD c4 LONGTEXT NOT NULL AFTER c2; @@ -31995,9 +31995,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` longtext NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; diff --git a/mysql-test/suite/engines/funcs/r/ta_add_column_middle2.result b/mysql-test/suite/engines/funcs/r/ta_add_column_middle2.result index e7eefc269be..c8ed71f99f3 100644 --- a/mysql-test/suite/engines/funcs/r/ta_add_column_middle2.result +++ b/mysql-test/suite/engines/funcs/r/ta_add_column_middle2.result @@ -3268,7 +3268,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` char(15) NOT NULL, `c2` int(11) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` char(20) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -3296,7 +3296,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` varchar(15) NOT NULL, `c2` int(11) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` varchar(20) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -3324,7 +3324,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` binary(15) NOT NULL, `c2` int(11) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` binary(20) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -3352,7 +3352,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` varbinary(15) NOT NULL, `c2` int(11) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` varbinary(20) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci diff --git a/mysql-test/suite/engines/funcs/r/ta_add_string2.result b/mysql-test/suite/engines/funcs/r/ta_add_string2.result index 7d50fa3b61d..9f829dd3b2f 100644 --- a/mysql-test/suite/engines/funcs/r/ta_add_string2.result +++ b/mysql-test/suite/engines/funcs/r/ta_add_string2.result @@ -842,7 +842,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t5 ADD c2 CHAR(5) NOT NULL; SHOW TABLES; @@ -851,7 +851,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` char(5) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t5; @@ -1898,7 +1898,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t5 ADD c2 VARCHAR(5) NOT NULL; SHOW TABLES; @@ -1907,7 +1907,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` varchar(5) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t5; @@ -2954,7 +2954,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t5 ADD c2 BINARY(5) NOT NULL; SHOW TABLES; @@ -2963,7 +2963,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` binary(5) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t5; @@ -4010,7 +4010,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t5 ADD c2 VARBINARY(5) NOT NULL; SHOW TABLES; @@ -4019,7 +4019,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` varbinary(5) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t5; diff --git a/mysql-test/suite/engines/funcs/r/ta_add_string_first2.result b/mysql-test/suite/engines/funcs/r/ta_add_string_first2.result index a656f1d48e1..f5c61673a21 100644 --- a/mysql-test/suite/engines/funcs/r/ta_add_string_first2.result +++ b/mysql-test/suite/engines/funcs/r/ta_add_string_first2.result @@ -842,7 +842,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t5 ADD c2 CHAR(5) NOT NULL FIRST; SHOW TABLES; @@ -852,7 +852,7 @@ SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( `c2` char(5) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t5; SHOW TABLES; @@ -1898,7 +1898,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t5 ADD c2 VARCHAR(5) NOT NULL FIRST; SHOW TABLES; @@ -1908,7 +1908,7 @@ SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( `c2` varchar(5) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t5; SHOW TABLES; @@ -2954,7 +2954,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t5 ADD c2 BINARY(5) NOT NULL FIRST; SHOW TABLES; @@ -2964,7 +2964,7 @@ SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( `c2` binary(5) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t5; SHOW TABLES; @@ -4010,7 +4010,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t5 ADD c2 VARBINARY(5) NOT NULL FIRST; SHOW TABLES; @@ -4020,7 +4020,7 @@ SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( `c2` varbinary(5) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t5; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/ta_add_string_middle2.result b/mysql-test/suite/engines/funcs/r/ta_add_string_middle2.result index 4829892354f..56fbf597cdc 100644 --- a/mysql-test/suite/engines/funcs/r/ta_add_string_middle2.result +++ b/mysql-test/suite/engines/funcs/r/ta_add_string_middle2.result @@ -398,7 +398,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c3` char(10) DEFAULT NULL, PRIMARY KEY (`c1`) @@ -410,7 +410,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c4` char(5) DEFAULT NULL, `c3` char(10) DEFAULT NULL, @@ -846,7 +846,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c3` char(10) NOT NULL, PRIMARY KEY (`c1`) @@ -858,7 +858,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c4` char(5) NOT NULL, `c3` char(10) NOT NULL, @@ -1294,7 +1294,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c3` varchar(10) DEFAULT NULL, PRIMARY KEY (`c1`) @@ -1306,7 +1306,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c4` varchar(5) DEFAULT NULL, `c3` varchar(10) DEFAULT NULL, @@ -1742,7 +1742,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c3` varchar(10) NOT NULL, PRIMARY KEY (`c1`) @@ -1754,7 +1754,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c4` varchar(5) NOT NULL, `c3` varchar(10) NOT NULL, @@ -2190,7 +2190,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c3` binary(10) DEFAULT NULL, PRIMARY KEY (`c1`) @@ -2202,7 +2202,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c4` binary(5) DEFAULT NULL, `c3` binary(10) DEFAULT NULL, @@ -2638,7 +2638,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c3` binary(10) NOT NULL, PRIMARY KEY (`c1`) @@ -2650,7 +2650,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c4` binary(5) NOT NULL, `c3` binary(10) NOT NULL, @@ -3086,7 +3086,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c3` varbinary(10) DEFAULT NULL, PRIMARY KEY (`c1`) @@ -3098,7 +3098,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c4` varbinary(5) DEFAULT NULL, `c3` varbinary(10) DEFAULT NULL, @@ -3534,7 +3534,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c3` varbinary(10) NOT NULL, PRIMARY KEY (`c1`) @@ -3546,7 +3546,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c4` varbinary(5) NOT NULL, `c3` varbinary(10) NOT NULL, diff --git a/mysql-test/suite/engines/funcs/r/ta_add_unique_index.result b/mysql-test/suite/engines/funcs/r/ta_add_unique_index.result index 1ec7f876355..5394c24bf5d 100644 --- a/mysql-test/suite/engines/funcs/r/ta_add_unique_index.result +++ b/mysql-test/suite/engines/funcs/r/ta_add_unique_index.result @@ -314,7 +314,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD UNIQUE (c1); SHOW TABLES; @@ -323,7 +323,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `c1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -666,7 +666,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD UNIQUE KEY (c1); SHOW TABLES; @@ -675,7 +675,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `c1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -1018,7 +1018,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD UNIQUE INDEX (c1); SHOW TABLES; @@ -1027,7 +1027,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `c1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -1370,7 +1370,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD CONSTRAINT UNIQUE (c1); SHOW TABLES; @@ -1379,7 +1379,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `c1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -1722,7 +1722,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD CONSTRAINT UNIQUE KEY (c1); SHOW TABLES; @@ -1731,7 +1731,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `c1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -2074,7 +2074,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD CONSTRAINT UNIQUE INDEX (c1); SHOW TABLES; @@ -2083,7 +2083,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `c1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -2426,7 +2426,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD CONSTRAINT cst1 UNIQUE (c1); SHOW TABLES; @@ -2435,7 +2435,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `cst1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -2778,7 +2778,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD CONSTRAINT cst1 UNIQUE KEY (c1); SHOW TABLES; @@ -2787,7 +2787,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `cst1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -3130,7 +3130,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD CONSTRAINT cst1 UNIQUE INDEX (c1); SHOW TABLES; @@ -3139,7 +3139,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `cst1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -3482,7 +3482,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD UNIQUE i1 (c1); SHOW TABLES; @@ -3491,7 +3491,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -3834,7 +3834,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD UNIQUE KEY i1 (c1); SHOW TABLES; @@ -3843,7 +3843,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -4186,7 +4186,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD UNIQUE INDEX i1 (c1); SHOW TABLES; @@ -4195,7 +4195,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -4538,7 +4538,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD CONSTRAINT UNIQUE i1 (c1); SHOW TABLES; @@ -4547,7 +4547,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -4890,7 +4890,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD CONSTRAINT UNIQUE KEY i1 (c1); SHOW TABLES; @@ -4899,7 +4899,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -5242,7 +5242,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD CONSTRAINT UNIQUE INDEX i1 (c1); SHOW TABLES; @@ -5251,7 +5251,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -5594,7 +5594,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD CONSTRAINT cst1 UNIQUE i1 (c1); SHOW TABLES; @@ -5603,7 +5603,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -5946,7 +5946,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD CONSTRAINT cst1 UNIQUE KEY i1 (c1); SHOW TABLES; @@ -5955,7 +5955,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -6298,7 +6298,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD CONSTRAINT cst1 UNIQUE INDEX i1 (c1); SHOW TABLES; @@ -6307,7 +6307,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; diff --git a/mysql-test/suite/engines/funcs/r/ta_column_to_index.result b/mysql-test/suite/engines/funcs/r/ta_column_to_index.result index 42906329967..b5e0a265674 100644 --- a/mysql-test/suite/engines/funcs/r/ta_column_to_index.result +++ b/mysql-test/suite/engines/funcs/r/ta_column_to_index.result @@ -314,7 +314,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD KEY (c1); SHOW TABLES; @@ -323,7 +323,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `c1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -666,7 +666,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD KEY USING BTREE (c1); SHOW TABLES; @@ -675,7 +675,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `c1` (`c1`) USING BTREE ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -1018,7 +1018,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD KEY USING HASH (c1); SHOW TABLES; @@ -1027,7 +1027,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `c1` (`c1`) USING HASH ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -1370,7 +1370,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD INDEX (c1); SHOW TABLES; @@ -1379,7 +1379,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `c1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -1722,7 +1722,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD INDEX USING BTREE (c1); SHOW TABLES; @@ -1731,7 +1731,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `c1` (`c1`) USING BTREE ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -2074,7 +2074,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD INDEX USING HASH (c1); SHOW TABLES; @@ -2083,7 +2083,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `c1` (`c1`) USING HASH ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -2426,7 +2426,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD KEY i1 (c1); SHOW TABLES; @@ -2435,7 +2435,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -2778,7 +2778,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD KEY i1 USING BTREE (c1); SHOW TABLES; @@ -2787,7 +2787,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) USING BTREE ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -3130,7 +3130,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD KEY i1 USING HASH (c1); SHOW TABLES; @@ -3139,7 +3139,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) USING HASH ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -3482,7 +3482,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD INDEX i1 (c1); SHOW TABLES; @@ -3491,7 +3491,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -3834,7 +3834,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD INDEX i1 USING BTREE (c1); SHOW TABLES; @@ -3843,7 +3843,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) USING BTREE ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; @@ -4186,7 +4186,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD INDEX i1 USING HASH (c1); SHOW TABLES; @@ -4195,7 +4195,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) USING HASH ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; diff --git a/mysql-test/suite/engines/funcs/r/ta_column_to_not_null.result b/mysql-test/suite/engines/funcs/r/ta_column_to_not_null.result index fe2ee35aa22..5fdec6d8c80 100644 --- a/mysql-test/suite/engines/funcs/r/ta_column_to_not_null.result +++ b/mysql-test/suite/engines/funcs/r/ta_column_to_not_null.result @@ -309,7 +309,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -813,7 +813,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/ta_column_to_null.result b/mysql-test/suite/engines/funcs/r/ta_column_to_null.result index 239e8016d58..96e2236e063 100644 --- a/mysql-test/suite/engines/funcs/r/ta_column_to_null.result +++ b/mysql-test/suite/engines/funcs/r/ta_column_to_null.result @@ -300,7 +300,7 @@ t2 SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t2 MODIFY c1 TIMESTAMP NULL; SHOW TABLES; @@ -804,7 +804,7 @@ t2 SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t2 CHANGE c1 c1 TIMESTAMP NULL; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/ta_column_to_pk.result b/mysql-test/suite/engines/funcs/r/ta_column_to_pk.result index b012a6c2446..3624e905cb2 100644 --- a/mysql-test/suite/engines/funcs/r/ta_column_to_pk.result +++ b/mysql-test/suite/engines/funcs/r/ta_column_to_pk.result @@ -314,7 +314,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD PRIMARY KEY (c1); SHOW TABLES; @@ -323,7 +323,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; diff --git a/mysql-test/suite/engines/funcs/r/ta_drop_column.result b/mysql-test/suite/engines/funcs/r/ta_drop_column.result index 207b847c403..840e4c78325 100644 --- a/mysql-test/suite/engines/funcs/r/ta_drop_column.result +++ b/mysql-test/suite/engines/funcs/r/ta_drop_column.result @@ -300,8 +300,8 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' + `c1` timestamp NOT NULL, + `c2` timestamp NULL DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 DROP c2; ALTER TABLE t1 DROP c1; @@ -309,7 +309,7 @@ ERROR 42000: You can't delete all columns with ALTER TABLE; use DROP TABLE inste SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -636,8 +636,8 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' + `c1` timestamp NOT NULL, + `c2` timestamp NULL DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 DROP COLUMN c2; ALTER TABLE t1 DROP COLUMN c1; @@ -645,7 +645,7 @@ ERROR 42000: You can't delete all columns with ALTER TABLE; use DROP TABLE inste SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/ta_drop_index.result b/mysql-test/suite/engines/funcs/r/ta_drop_index.result index 75e366bfa0f..bada7f1dc71 100644 --- a/mysql-test/suite/engines/funcs/r/ta_drop_index.result +++ b/mysql-test/suite/engines/funcs/r/ta_drop_index.result @@ -314,7 +314,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 DROP KEY i1; @@ -324,7 +324,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -666,7 +666,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 DROP KEY i1; @@ -676,7 +676,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -1018,7 +1018,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 DROP KEY i1; @@ -1028,7 +1028,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -1370,7 +1370,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 DROP INDEX i1; @@ -1380,7 +1380,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -1722,7 +1722,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 DROP INDEX i1; @@ -1732,7 +1732,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; @@ -2074,7 +2074,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 DROP INDEX i1; @@ -2084,7 +2084,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/ta_drop_pk_number.result b/mysql-test/suite/engines/funcs/r/ta_drop_pk_number.result index 79858857742..9af57069422 100644 --- a/mysql-test/suite/engines/funcs/r/ta_drop_pk_number.result +++ b/mysql-test/suite/engines/funcs/r/ta_drop_pk_number.result @@ -314,7 +314,7 @@ t9 SHOW CREATE TABLE t9; Table Create Table t9 CREATE TABLE `t9` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t9 DROP PRIMARY KEY; @@ -324,7 +324,7 @@ t9 SHOW CREATE TABLE t9; Table Create Table t9 CREATE TABLE `t9` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t9; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/ta_rename.result b/mysql-test/suite/engines/funcs/r/ta_rename.result index 7a1490e4f79..1528e6fe7eb 100644 --- a/mysql-test/suite/engines/funcs/r/ta_rename.result +++ b/mysql-test/suite/engines/funcs/r/ta_rename.result @@ -356,8 +356,8 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' + `c1` timestamp NOT NULL, + `c2` timestamp NULL DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 RENAME t2; SHOW TABLES; @@ -368,8 +368,8 @@ ERROR 42S02: Unknown table 'test.t1' SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' + `c1` timestamp NOT NULL, + `c2` timestamp NULL DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; SHOW TABLES; @@ -756,8 +756,8 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' + `c1` timestamp NOT NULL, + `c2` timestamp NULL DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 RENAME TO t2; SHOW TABLES; @@ -768,8 +768,8 @@ ERROR 42S02: Unknown table 'test.t1' SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' + `c1` timestamp NOT NULL, + `c2` timestamp NULL DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/tc_column_key.result b/mysql-test/suite/engines/funcs/r/tc_column_key.result index 54772842bea..2b3fa1c0918 100644 --- a/mysql-test/suite/engines/funcs/r/tc_column_key.result +++ b/mysql-test/suite/engines/funcs/r/tc_column_key.result @@ -227,7 +227,7 @@ t9 SHOW CREATE TABLE t9; Table Create Table t9 CREATE TABLE `t9` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t9; diff --git a/mysql-test/suite/engines/funcs/r/tc_column_not_null.result b/mysql-test/suite/engines/funcs/r/tc_column_not_null.result index 9add115123d..eca7439adfa 100644 --- a/mysql-test/suite/engines/funcs/r/tc_column_not_null.result +++ b/mysql-test/suite/engines/funcs/r/tc_column_not_null.result @@ -210,7 +210,7 @@ t2 SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/tc_column_primary_key_number.result b/mysql-test/suite/engines/funcs/r/tc_column_primary_key_number.result index f01e18283f6..42be2e20f22 100644 --- a/mysql-test/suite/engines/funcs/r/tc_column_primary_key_number.result +++ b/mysql-test/suite/engines/funcs/r/tc_column_primary_key_number.result @@ -227,7 +227,7 @@ t9 SHOW CREATE TABLE t9; Table Create Table t9 CREATE TABLE `t9` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t9; diff --git a/mysql-test/suite/engines/funcs/r/tc_column_unique_key.result b/mysql-test/suite/engines/funcs/r/tc_column_unique_key.result index ef6033e73f4..5fb8cd5be6c 100644 --- a/mysql-test/suite/engines/funcs/r/tc_column_unique_key.result +++ b/mysql-test/suite/engines/funcs/r/tc_column_unique_key.result @@ -227,7 +227,7 @@ t9 SHOW CREATE TABLE t9; Table Create Table t9 CREATE TABLE `t9` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `c1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t9; diff --git a/mysql-test/suite/engines/funcs/r/tc_multicolumn_different.result b/mysql-test/suite/engines/funcs/r/tc_multicolumn_different.result index 1baef8e3266..4b5cf0b7a0b 100644 --- a/mysql-test/suite/engines/funcs/r/tc_multicolumn_different.result +++ b/mysql-test/suite/engines/funcs/r/tc_multicolumn_different.result @@ -333,7 +333,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -713,7 +713,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -1093,7 +1093,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -1473,7 +1473,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -1853,7 +1853,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -2233,7 +2233,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -2613,7 +2613,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -2993,7 +2993,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -3373,7 +3373,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -3753,7 +3753,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -4133,7 +4133,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -4513,7 +4513,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -4893,7 +4893,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -5273,7 +5273,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -5653,7 +5653,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -6033,7 +6033,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -6413,7 +6413,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -6793,7 +6793,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -7173,7 +7173,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -7553,7 +7553,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -7933,7 +7933,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -8313,7 +8313,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -8693,7 +8693,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -9073,7 +9073,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -9453,7 +9453,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -9833,7 +9833,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -10213,7 +10213,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -10593,7 +10593,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -10973,7 +10973,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -11353,7 +11353,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -11733,7 +11733,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -12113,7 +12113,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -12493,7 +12493,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -12873,7 +12873,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -13253,7 +13253,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -13633,7 +13633,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -14013,7 +14013,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -14393,7 +14393,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -14773,7 +14773,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -15153,7 +15153,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -15533,7 +15533,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -15913,7 +15913,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -16293,7 +16293,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -16673,7 +16673,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -17053,7 +17053,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -17433,7 +17433,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -17813,7 +17813,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -18193,7 +18193,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -18573,7 +18573,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -18953,7 +18953,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -19333,7 +19333,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -19713,7 +19713,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -20093,7 +20093,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -20473,7 +20473,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -20853,7 +20853,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -21233,7 +21233,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -21613,7 +21613,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -21993,7 +21993,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -22373,7 +22373,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -22753,7 +22753,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -23133,7 +23133,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -23513,7 +23513,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -23893,7 +23893,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -24273,7 +24273,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -24653,7 +24653,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -25033,7 +25033,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -25413,7 +25413,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -25793,7 +25793,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -26173,7 +26173,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -26553,7 +26553,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -26933,7 +26933,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -27313,7 +27313,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -27693,7 +27693,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -28073,7 +28073,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -28453,7 +28453,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -28833,7 +28833,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -29213,7 +29213,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -29593,7 +29593,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -29973,7 +29973,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -30353,7 +30353,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -30733,7 +30733,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -31113,7 +31113,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -31493,7 +31493,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -31873,7 +31873,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -32253,7 +32253,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -32633,7 +32633,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -33013,7 +33013,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -33393,7 +33393,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -33773,7 +33773,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -34153,7 +34153,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -34533,7 +34533,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -34913,7 +34913,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -35293,7 +35293,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -35673,7 +35673,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -36053,7 +36053,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -36433,7 +36433,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) diff --git a/mysql-test/suite/engines/funcs/r/tc_multicolumn_same.result b/mysql-test/suite/engines/funcs/r/tc_multicolumn_same.result index 81bd62e94d1..bcece36b0d4 100644 --- a/mysql-test/suite/engines/funcs/r/tc_multicolumn_same.result +++ b/mysql-test/suite/engines/funcs/r/tc_multicolumn_same.result @@ -313,10 +313,10 @@ SHOW CREATE TABLE m1; Table Create Table m1 CREATE TABLE `m1` ( `c1` timestamp NULL DEFAULT NULL, - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, `c3` timestamp NULL DEFAULT NULL, - `c4` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c4` timestamp NOT NULL, + `c5` timestamp NOT NULL, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci diff --git a/mysql-test/suite/engines/funcs/r/tc_temporary_column.result b/mysql-test/suite/engines/funcs/r/tc_temporary_column.result index 4f5c0b01b8e..03627817a35 100644 --- a/mysql-test/suite/engines/funcs/r/tc_temporary_column.result +++ b/mysql-test/suite/engines/funcs/r/tc_temporary_column.result @@ -500,7 +500,7 @@ Tables_in_test SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/t/rpl_trigger.test b/mysql-test/suite/engines/funcs/t/rpl_trigger.test index 4f61e738200..12eef32ef83 100644 --- a/mysql-test/suite/engines/funcs/t/rpl_trigger.test +++ b/mysql-test/suite/engines/funcs/t/rpl_trigger.test @@ -5,6 +5,12 @@ --source include/have_binlog_format_mixed_or_statement.inc --source include/master-slave.inc +connection slave; +--source include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +--source include/start_slave.inc +--connection master + call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); # @@ -315,7 +321,8 @@ let $binlog_version= query_get_value(SHOW BINLOG EVENTS, Info, 1); # Make the slave to replay the new binlog. connection slave; -RESET SLAVE; +--let $master_use_gtid_option= No +--source include/reset_slave.inc --source include/start_slave.inc SELECT MASTER_POS_WAIT('master-bin.000001', 513) >= 0; @@ -342,7 +349,7 @@ DROP TABLE t1; DROP TABLE t2; --source include/stop_slave.inc -RESET SLAVE; +--source include/reset_slave.inc # The master should be clean. diff --git a/mysql-test/suite/federated/federatedx_versioning.test b/mysql-test/suite/federated/federatedx_versioning.test index 6c3247cea55..4d2f2d35139 100644 --- a/mysql-test/suite/federated/federatedx_versioning.test +++ b/mysql-test/suite/federated/federatedx_versioning.test @@ -12,7 +12,7 @@ eval create or replace table t1 ( with system versioning; --replace_result $MASTER_MYPORT MASTER_MYPORT eval create or replace table tf engine=FEDERATED connection='mysql://root@127.0.0.1:$MASTER_MYPORT/test/t1'; ---replace_result $MASTER_MYPORT MASTER_MYPORT $sys_datatype_expl SYS_TYPE 19710101000000 "'1971-01-01 00:00:00.000000'" " NOT NULL" "" +--replace_result $MASTER_MYPORT MASTER_MYPORT $sys_datatype_expl SYS_TYPE 19710101000000 "'1971-01-01 00:00:00.000000'" "NOT NULL " "" show create table tf; --echo # INSERT insert into t1 values (1); diff --git a/mysql-test/suite/funcs_1/r/charset_collation.result b/mysql-test/suite/funcs_1/r/charset_collation.result index 002fcf55365..c0c36d9e729 100644 --- a/mysql-test/suite/funcs_1/r/charset_collation.result +++ b/mysql-test/suite/funcs_1/r/charset_collation.result @@ -31,11 +31,11 @@ AND (collation_name LIKE CONCAT(character_set_name,'_general_ci') OR collation_name LIKE CONCAT(character_set_name,'_bin')) ORDER BY collation_name, character_set_name; -COLLATION_NAME CHARACTER_SET_NAME -latin1_bin latin1 -latin1_general_ci latin1 -utf8mb3_bin utf8mb3 -utf8mb3_general_ci utf8mb3 +COLLATION_NAME CHARACTER_SET_NAME FULL_COLLATION_NAME ID IS_DEFAULT +latin1_bin latin1 latin1_bin 47 +latin1_general_ci latin1 latin1_general_ci 48 +utf8mb3_bin utf8mb3 utf8mb3_bin 83 +utf8mb3_general_ci utf8mb3 utf8mb3_general_ci 33 Yes connection default; disconnect con; DROP USER dbdict_test@localhost; diff --git a/mysql-test/suite/funcs_1/r/is_character_sets.result b/mysql-test/suite/funcs_1/r/is_character_sets.result index 6a1671a473c..57215693979 100644 --- a/mysql-test/suite/funcs_1/r/is_character_sets.result +++ b/mysql-test/suite/funcs_1/r/is_character_sets.result @@ -29,21 +29,21 @@ DROP FUNCTION test.f1; DESCRIBE information_schema.CHARACTER_SETS; Field Type Null Key Default Extra CHARACTER_SET_NAME varchar(32) NO NULL -DEFAULT_COLLATE_NAME varchar(32) NO NULL +DEFAULT_COLLATE_NAME varchar(64) NO NULL DESCRIPTION varchar(60) NO NULL MAXLEN bigint(3) NO NULL SHOW CREATE TABLE information_schema.CHARACTER_SETS; Table Create Table CHARACTER_SETS CREATE TEMPORARY TABLE `CHARACTER_SETS` ( `CHARACTER_SET_NAME` varchar(32) NOT NULL, - `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL, + `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL, `DESCRIPTION` varchar(60) NOT NULL, `MAXLEN` bigint(3) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SHOW COLUMNS FROM information_schema.CHARACTER_SETS; Field Type Null Key Default Extra CHARACTER_SET_NAME varchar(32) NO NULL -DEFAULT_COLLATE_NAME varchar(32) NO NULL +DEFAULT_COLLATE_NAME varchar(64) NO NULL DESCRIPTION varchar(60) NO NULL MAXLEN bigint(3) NO NULL # Testcases 3.2.2.2 and 3.2.2.3 are checked in suite/funcs_1/t/charset_collation*.test diff --git a/mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result b/mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result index d1663dfcde4..fbd7654984e 100644 --- a/mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result +++ b/mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result @@ -28,18 +28,27 @@ DROP FUNCTION test.f1; ######################################################################### DESCRIBE information_schema.COLLATION_CHARACTER_SET_APPLICABILITY; Field Type Null Key Default Extra -COLLATION_NAME varchar(32) NO NULL +COLLATION_NAME varchar(64) NO NULL CHARACTER_SET_NAME varchar(32) NO NULL +FULL_COLLATION_NAME varchar(64) NO NULL +ID bigint(11) NO NULL +IS_DEFAULT varchar(3) NO NULL SHOW CREATE TABLE information_schema.COLLATION_CHARACTER_SET_APPLICABILITY; Table Create Table COLLATION_CHARACTER_SET_APPLICABILITY CREATE TEMPORARY TABLE `COLLATION_CHARACTER_SET_APPLICABILITY` ( - `COLLATION_NAME` varchar(32) NOT NULL, - `CHARACTER_SET_NAME` varchar(32) NOT NULL + `COLLATION_NAME` varchar(64) NOT NULL, + `CHARACTER_SET_NAME` varchar(32) NOT NULL, + `FULL_COLLATION_NAME` varchar(64) NOT NULL, + `ID` bigint(11) NOT NULL, + `IS_DEFAULT` varchar(3) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SHOW COLUMNS FROM information_schema.COLLATION_CHARACTER_SET_APPLICABILITY; Field Type Null Key Default Extra -COLLATION_NAME varchar(32) NO NULL +COLLATION_NAME varchar(64) NO NULL CHARACTER_SET_NAME varchar(32) NO NULL +FULL_COLLATION_NAME varchar(64) NO NULL +ID bigint(11) NO NULL +IS_DEFAULT varchar(3) NO NULL # Testcases 3.2.4.2 and 3.2.4.3 are checked in suite/funcs_1/t/charset_collation*.test ######################################################################## # Testcases 3.2.1.3-3.2.1.5 + 3.2.1.8-3.2.1.12: INSERT/UPDATE/DELETE and diff --git a/mysql-test/suite/funcs_1/r/is_collations.result b/mysql-test/suite/funcs_1/r/is_collations.result index 1e840d50717..979b477b8bc 100644 --- a/mysql-test/suite/funcs_1/r/is_collations.result +++ b/mysql-test/suite/funcs_1/r/is_collations.result @@ -28,28 +28,28 @@ DROP FUNCTION test.f1; ######################################################################### DESCRIBE information_schema.COLLATIONS; Field Type Null Key Default Extra -COLLATION_NAME varchar(32) NO NULL -CHARACTER_SET_NAME varchar(32) NO NULL -ID bigint(11) NO NULL -IS_DEFAULT varchar(3) NO NULL +COLLATION_NAME varchar(64) NO NULL +CHARACTER_SET_NAME varchar(32) YES NULL +ID bigint(11) YES NULL +IS_DEFAULT varchar(3) YES NULL IS_COMPILED varchar(3) NO NULL SORTLEN bigint(3) NO NULL SHOW CREATE TABLE information_schema.COLLATIONS; Table Create Table COLLATIONS CREATE TEMPORARY TABLE `COLLATIONS` ( - `COLLATION_NAME` varchar(32) NOT NULL, - `CHARACTER_SET_NAME` varchar(32) NOT NULL, - `ID` bigint(11) NOT NULL, - `IS_DEFAULT` varchar(3) NOT NULL, + `COLLATION_NAME` varchar(64) NOT NULL, + `CHARACTER_SET_NAME` varchar(32), + `ID` bigint(11), + `IS_DEFAULT` varchar(3), `IS_COMPILED` varchar(3) NOT NULL, `SORTLEN` bigint(3) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SHOW COLUMNS FROM information_schema.COLLATIONS; Field Type Null Key Default Extra -COLLATION_NAME varchar(32) NO NULL -CHARACTER_SET_NAME varchar(32) NO NULL -ID bigint(11) NO NULL -IS_DEFAULT varchar(3) NO NULL +COLLATION_NAME varchar(64) NO NULL +CHARACTER_SET_NAME varchar(32) YES NULL +ID bigint(11) YES NULL +IS_DEFAULT varchar(3) YES NULL IS_COMPILED varchar(3) NO NULL SORTLEN bigint(3) NO NULL # Testcases 3.2.3.2 and 3.2.3.3 are checked in suite/funcs_1/t/charset_collation*.test diff --git a/mysql-test/suite/funcs_1/r/is_columns.result b/mysql-test/suite/funcs_1/r/is_columns.result index 7cd949c36aa..3d03a1d288a 100644 --- a/mysql-test/suite/funcs_1/r/is_columns.result +++ b/mysql-test/suite/funcs_1/r/is_columns.result @@ -42,7 +42,7 @@ NUMERIC_PRECISION bigint(21) unsigned YES NULL NUMERIC_SCALE bigint(21) unsigned YES NULL DATETIME_PRECISION bigint(21) unsigned YES NULL CHARACTER_SET_NAME varchar(32) YES NULL -COLLATION_NAME varchar(32) YES NULL +COLLATION_NAME varchar(64) YES NULL COLUMN_TYPE longtext NO NULL COLUMN_KEY varchar(3) NO NULL EXTRA varchar(80) NO NULL @@ -67,7 +67,7 @@ COLUMNS CREATE TEMPORARY TABLE `COLUMNS` ( `NUMERIC_SCALE` bigint(21) unsigned, `DATETIME_PRECISION` bigint(21) unsigned, `CHARACTER_SET_NAME` varchar(32), - `COLLATION_NAME` varchar(32), + `COLLATION_NAME` varchar(64), `COLUMN_TYPE` longtext NOT NULL, `COLUMN_KEY` varchar(3) NOT NULL, `EXTRA` varchar(80) NOT NULL, @@ -92,7 +92,7 @@ NUMERIC_PRECISION bigint(21) unsigned YES NULL NUMERIC_SCALE bigint(21) unsigned YES NULL DATETIME_PRECISION bigint(21) unsigned YES NULL CHARACTER_SET_NAME varchar(32) YES NULL -COLLATION_NAME varchar(32) YES NULL +COLLATION_NAME varchar(64) YES NULL COLUMN_TYPE longtext NO NULL COLUMN_KEY varchar(3) NO NULL EXTRA varchar(80) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_columns_is.result b/mysql-test/suite/funcs_1/r/is_columns_is.result index 3664f6861af..c88a3a9ac8d 100644 --- a/mysql-test/suite/funcs_1/r/is_columns_is.result +++ b/mysql-test/suite/funcs_1/r/is_columns_is.result @@ -21,7 +21,7 @@ def information_schema APPLICABLE_ROLES IS_DEFAULT 4 NULL YES varchar 3 9 NULL N def information_schema APPLICABLE_ROLES IS_GRANTABLE 3 NULL NO varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) select NEVER NULL def information_schema APPLICABLE_ROLES ROLE_NAME 2 NULL NO varchar 128 384 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(128) select NEVER NULL def information_schema CHARACTER_SETS CHARACTER_SET_NAME 1 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) select NEVER NULL -def information_schema CHARACTER_SETS DEFAULT_COLLATE_NAME 2 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) select NEVER NULL +def information_schema CHARACTER_SETS DEFAULT_COLLATE_NAME 2 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NEVER NULL def information_schema CHARACTER_SETS DESCRIPTION 3 NULL NO varchar 60 180 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(60) select NEVER NULL def information_schema CHARACTER_SETS MAXLEN 4 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(3) select NEVER NULL def information_schema CHECK_CONSTRAINTS CHECK_CLAUSE 6 NULL NO longtext 4294967295 4294967295 NULL NULL NULL utf8mb3 utf8mb3_general_ci longtext select NEVER NULL @@ -55,18 +55,21 @@ def information_schema CLIENT_STATISTICS SELECT_COMMANDS 15 NULL NO bigint NULL def information_schema CLIENT_STATISTICS TOTAL_CONNECTIONS 2 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(21) select NEVER NULL def information_schema CLIENT_STATISTICS TOTAL_SSL_CONNECTIONS 24 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(21) unsigned select NEVER NULL def information_schema CLIENT_STATISTICS UPDATE_COMMANDS 16 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(21) select NEVER NULL -def information_schema COLLATIONS CHARACTER_SET_NAME 2 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) select NEVER NULL -def information_schema COLLATIONS COLLATION_NAME 1 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) select NEVER NULL -def information_schema COLLATIONS ID 3 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(11) select NEVER NULL +def information_schema COLLATIONS CHARACTER_SET_NAME 2 NULL YES varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) select NEVER NULL +def information_schema COLLATIONS COLLATION_NAME 1 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NEVER NULL +def information_schema COLLATIONS ID 3 NULL YES bigint NULL NULL 19 0 NULL NULL NULL bigint(11) select NEVER NULL def information_schema COLLATIONS IS_COMPILED 5 NULL NO varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) select NEVER NULL -def information_schema COLLATIONS IS_DEFAULT 4 NULL NO varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) select NEVER NULL +def information_schema COLLATIONS IS_DEFAULT 4 NULL YES varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) select NEVER NULL def information_schema COLLATIONS SORTLEN 6 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(3) select NEVER NULL def information_schema COLLATION_CHARACTER_SET_APPLICABILITY CHARACTER_SET_NAME 2 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) select NEVER NULL -def information_schema COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME 1 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) select NEVER NULL +def information_schema COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME 1 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NEVER NULL +def information_schema COLLATION_CHARACTER_SET_APPLICABILITY FULL_COLLATION_NAME 3 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NEVER NULL +def information_schema COLLATION_CHARACTER_SET_APPLICABILITY ID 4 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(11) select NEVER NULL +def information_schema COLLATION_CHARACTER_SET_APPLICABILITY IS_DEFAULT 5 NULL NO varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) select NEVER NULL def information_schema COLUMNS CHARACTER_MAXIMUM_LENGTH 9 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(21) unsigned select NEVER NULL def information_schema COLUMNS CHARACTER_OCTET_LENGTH 10 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(21) unsigned select NEVER NULL def information_schema COLUMNS CHARACTER_SET_NAME 14 NULL YES varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) select NEVER NULL -def information_schema COLUMNS COLLATION_NAME 15 NULL YES varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) select NEVER NULL +def information_schema COLUMNS COLLATION_NAME 15 NULL YES varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NEVER NULL def information_schema COLUMNS COLUMN_COMMENT 20 NULL NO varchar 1024 3072 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(1024) select NEVER NULL def information_schema COLUMNS COLUMN_DEFAULT 6 NULL YES longtext 4294967295 4294967295 NULL NULL NULL utf8mb3 utf8mb3_general_ci longtext select NEVER NULL def information_schema COLUMNS COLUMN_KEY 17 NULL NO varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) select NEVER NULL @@ -100,9 +103,9 @@ def information_schema ENGINES SUPPORT 2 NULL NO varchar 8 24 NULL NULL NULL utf def information_schema ENGINES TRANSACTIONS 4 NULL YES varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) select NEVER NULL def information_schema ENGINES XA 5 NULL YES varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) select NEVER NULL def information_schema EVENTS CHARACTER_SET_CLIENT 22 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) select NEVER NULL -def information_schema EVENTS COLLATION_CONNECTION 23 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) select NEVER NULL +def information_schema EVENTS COLLATION_CONNECTION 23 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NEVER NULL def information_schema EVENTS CREATED 17 NULL NO datetime NULL NULL NULL NULL 0 NULL NULL datetime select NEVER NULL -def information_schema EVENTS DATABASE_COLLATION 24 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) select NEVER NULL +def information_schema EVENTS DATABASE_COLLATION 24 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NEVER NULL def information_schema EVENTS DEFINER 4 NULL NO varchar 384 1152 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(384) select NEVER NULL def information_schema EVENTS ENDS 14 NULL YES datetime NULL NULL NULL NULL 0 NULL NULL datetime select NEVER NULL def information_schema EVENTS EVENT_BODY 6 NULL NO varchar 8 24 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(8) select NEVER NULL @@ -298,10 +301,10 @@ def information_schema ROUTINES CHARACTER_MAXIMUM_LENGTH 7 NULL YES int NULL NUL def information_schema ROUTINES CHARACTER_OCTET_LENGTH 8 NULL YES int NULL NULL 10 0 NULL NULL NULL int(21) select NEVER NULL def information_schema ROUTINES CHARACTER_SET_CLIENT 29 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) select NEVER NULL def information_schema ROUTINES CHARACTER_SET_NAME 12 NULL YES varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NEVER NULL -def information_schema ROUTINES COLLATION_CONNECTION 30 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) select NEVER NULL +def information_schema ROUTINES COLLATION_CONNECTION 30 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NEVER NULL def information_schema ROUTINES COLLATION_NAME 13 NULL YES varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NEVER NULL def information_schema ROUTINES CREATED 24 NULL NO datetime NULL NULL NULL NULL 0 NULL NULL datetime select NEVER NULL -def information_schema ROUTINES DATABASE_COLLATION 31 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) select NEVER NULL +def information_schema ROUTINES DATABASE_COLLATION 31 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NEVER NULL def information_schema ROUTINES DATA_TYPE 6 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NEVER NULL def information_schema ROUTINES DATETIME_PRECISION 11 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(21) unsigned select NEVER NULL def information_schema ROUTINES DEFINER 28 NULL NO varchar 384 1152 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(384) select NEVER NULL @@ -327,7 +330,7 @@ def information_schema ROUTINES SQL_MODE 26 NULL NO varchar 8192 24576 NULL NULL def information_schema ROUTINES SQL_PATH 22 NULL YES varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NEVER NULL def information_schema SCHEMATA CATALOG_NAME 1 NULL NO varchar 512 1536 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(512) select NEVER NULL def information_schema SCHEMATA DEFAULT_CHARACTER_SET_NAME 3 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) select NEVER NULL -def information_schema SCHEMATA DEFAULT_COLLATION_NAME 4 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) select NEVER NULL +def information_schema SCHEMATA DEFAULT_COLLATION_NAME 4 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NEVER NULL def information_schema SCHEMATA SCHEMA_COMMENT 6 NULL NO varchar 1024 3072 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(1024) select NEVER NULL def information_schema SCHEMATA SCHEMA_NAME 2 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NEVER NULL def information_schema SCHEMATA SQL_PATH 5 NULL YES varchar 512 1536 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(512) select NEVER NULL @@ -391,7 +394,7 @@ def information_schema TABLES MAX_DATA_LENGTH 11 NULL YES bigint NULL NULL 20 0 def information_schema TABLES MAX_INDEX_LENGTH 22 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(21) unsigned select NEVER NULL def information_schema TABLES ROW_FORMAT 7 NULL YES varchar 10 30 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(10) select NEVER NULL def information_schema TABLES TABLE_CATALOG 1 NULL NO varchar 512 1536 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(512) select NEVER NULL -def information_schema TABLES TABLE_COLLATION 18 NULL YES varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) select NEVER NULL +def information_schema TABLES TABLE_COLLATION 18 NULL YES varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NEVER NULL def information_schema TABLES TABLE_COMMENT 21 NULL NO varchar 2048 6144 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(2048) select NEVER NULL def information_schema TABLES TABLE_NAME 3 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NEVER NULL def information_schema TABLES TABLE_ROWS 8 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(21) unsigned select NEVER NULL @@ -436,9 +439,9 @@ def information_schema TRIGGERS ACTION_REFERENCE_OLD_TABLE 13 NULL YES varchar 6 def information_schema TRIGGERS ACTION_STATEMENT 10 NULL NO longtext 4294967295 4294967295 NULL NULL NULL utf8mb3 utf8mb3_general_ci longtext select NEVER NULL def information_schema TRIGGERS ACTION_TIMING 12 NULL NO varchar 6 18 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(6) select NEVER NULL def information_schema TRIGGERS CHARACTER_SET_CLIENT 20 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) select NEVER NULL -def information_schema TRIGGERS COLLATION_CONNECTION 21 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) select NEVER NULL +def information_schema TRIGGERS COLLATION_CONNECTION 21 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NEVER NULL def information_schema TRIGGERS CREATED 17 NULL YES datetime NULL NULL NULL NULL 2 NULL NULL datetime(2) select NEVER NULL -def information_schema TRIGGERS DATABASE_COLLATION 22 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) select NEVER NULL +def information_schema TRIGGERS DATABASE_COLLATION 22 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NEVER NULL def information_schema TRIGGERS DEFINER 19 NULL NO varchar 384 1152 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(384) select NEVER NULL def information_schema TRIGGERS EVENT_MANIPULATION 4 NULL NO varchar 6 18 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(6) select NEVER NULL def information_schema TRIGGERS EVENT_OBJECT_CATALOG 5 NULL NO varchar 512 1536 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(512) select NEVER NULL @@ -480,7 +483,7 @@ def information_schema USER_STATISTICS USER 1 NULL NO varchar 128 384 NULL NULL def information_schema VIEWS ALGORITHM 11 NULL NO varchar 10 30 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(10) select NEVER NULL def information_schema VIEWS CHARACTER_SET_CLIENT 9 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) select NEVER NULL def information_schema VIEWS CHECK_OPTION 5 NULL NO varchar 8 24 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(8) select NEVER NULL -def information_schema VIEWS COLLATION_CONNECTION 10 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) select NEVER NULL +def information_schema VIEWS COLLATION_CONNECTION 10 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NEVER NULL def information_schema VIEWS DEFINER 7 NULL NO varchar 384 1152 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(384) select NEVER NULL def information_schema VIEWS IS_UPDATABLE 6 NULL NO varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) select NEVER NULL def information_schema VIEWS SECURITY_TYPE 8 NULL NO varchar 7 21 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(7) select NEVER NULL @@ -569,7 +572,7 @@ COL_CML TABLE_SCHEMA TABLE_NAME COLUMN_NAME DATA_TYPE CHARACTER_MAXIMUM_LENGTH C 3.0000 information_schema APPLICABLE_ROLES IS_GRANTABLE varchar 3 9 utf8mb3 utf8mb3_general_ci varchar(3) 3.0000 information_schema APPLICABLE_ROLES IS_DEFAULT varchar 3 9 utf8mb3 utf8mb3_general_ci varchar(3) 3.0000 information_schema CHARACTER_SETS CHARACTER_SET_NAME varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) -3.0000 information_schema CHARACTER_SETS DEFAULT_COLLATE_NAME varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) +3.0000 information_schema CHARACTER_SETS DEFAULT_COLLATE_NAME varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) 3.0000 information_schema CHARACTER_SETS DESCRIPTION varchar 60 180 utf8mb3 utf8mb3_general_ci varchar(60) NULL information_schema CHARACTER_SETS MAXLEN bigint NULL NULL NULL NULL bigint(3) 3.0000 information_schema CHECK_CONSTRAINTS CONSTRAINT_CATALOG varchar 512 1536 utf8mb3 utf8mb3_general_ci varchar(512) @@ -603,14 +606,17 @@ NULL information_schema CLIENT_STATISTICS ACCESS_DENIED bigint NULL NULL NULL NU NULL information_schema CLIENT_STATISTICS EMPTY_QUERIES bigint NULL NULL NULL NULL bigint(21) NULL information_schema CLIENT_STATISTICS TOTAL_SSL_CONNECTIONS bigint NULL NULL NULL NULL bigint(21) unsigned NULL information_schema CLIENT_STATISTICS MAX_STATEMENT_TIME_EXCEEDED bigint NULL NULL NULL NULL bigint(21) -3.0000 information_schema COLLATIONS COLLATION_NAME varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) +3.0000 information_schema COLLATIONS COLLATION_NAME varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) 3.0000 information_schema COLLATIONS CHARACTER_SET_NAME varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) NULL information_schema COLLATIONS ID bigint NULL NULL NULL NULL bigint(11) 3.0000 information_schema COLLATIONS IS_DEFAULT varchar 3 9 utf8mb3 utf8mb3_general_ci varchar(3) 3.0000 information_schema COLLATIONS IS_COMPILED varchar 3 9 utf8mb3 utf8mb3_general_ci varchar(3) NULL information_schema COLLATIONS SORTLEN bigint NULL NULL NULL NULL bigint(3) -3.0000 information_schema COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) +3.0000 information_schema COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) 3.0000 information_schema COLLATION_CHARACTER_SET_APPLICABILITY CHARACTER_SET_NAME varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) +3.0000 information_schema COLLATION_CHARACTER_SET_APPLICABILITY FULL_COLLATION_NAME varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) +NULL information_schema COLLATION_CHARACTER_SET_APPLICABILITY ID bigint NULL NULL NULL NULL bigint(11) +3.0000 information_schema COLLATION_CHARACTER_SET_APPLICABILITY IS_DEFAULT varchar 3 9 utf8mb3 utf8mb3_general_ci varchar(3) 3.0000 information_schema COLUMNS TABLE_CATALOG varchar 512 1536 utf8mb3 utf8mb3_general_ci varchar(512) 3.0000 information_schema COLUMNS TABLE_SCHEMA varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) 3.0000 information_schema COLUMNS TABLE_NAME varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) @@ -625,7 +631,7 @@ NULL information_schema COLUMNS NUMERIC_PRECISION bigint NULL NULL NULL NULL big NULL information_schema COLUMNS NUMERIC_SCALE bigint NULL NULL NULL NULL bigint(21) unsigned NULL information_schema COLUMNS DATETIME_PRECISION bigint NULL NULL NULL NULL bigint(21) unsigned 3.0000 information_schema COLUMNS CHARACTER_SET_NAME varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) -3.0000 information_schema COLUMNS COLLATION_NAME varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) +3.0000 information_schema COLUMNS COLLATION_NAME varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) 1.0000 information_schema COLUMNS COLUMN_TYPE longtext 4294967295 4294967295 utf8mb3 utf8mb3_general_ci longtext 3.0000 information_schema COLUMNS COLUMN_KEY varchar 3 9 utf8mb3 utf8mb3_general_ci varchar(3) 3.0000 information_schema COLUMNS EXTRA varchar 80 240 utf8mb3 utf8mb3_general_ci varchar(80) @@ -669,8 +675,8 @@ NULL information_schema EVENTS LAST_EXECUTED datetime NULL NULL NULL NULL dateti 3.0000 information_schema EVENTS EVENT_COMMENT varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) NULL information_schema EVENTS ORIGINATOR bigint NULL NULL NULL NULL bigint(10) 3.0000 information_schema EVENTS CHARACTER_SET_CLIENT varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) -3.0000 information_schema EVENTS COLLATION_CONNECTION varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) -3.0000 information_schema EVENTS DATABASE_COLLATION varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) +3.0000 information_schema EVENTS COLLATION_CONNECTION varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) +3.0000 information_schema EVENTS DATABASE_COLLATION varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) NULL information_schema FILES FILE_ID bigint NULL NULL NULL NULL bigint(4) 3.0000 information_schema FILES FILE_NAME varchar 512 1536 utf8mb3 utf8mb3_general_ci varchar(512) 3.0000 information_schema FILES FILE_TYPE varchar 20 60 utf8mb3 utf8mb3_general_ci varchar(20) @@ -871,12 +877,12 @@ NULL information_schema ROUTINES LAST_ALTERED datetime NULL NULL NULL NULL datet 1.0000 information_schema ROUTINES ROUTINE_COMMENT longtext 4294967295 4294967295 utf8mb3 utf8mb3_general_ci longtext 3.0000 information_schema ROUTINES DEFINER varchar 384 1152 utf8mb3 utf8mb3_general_ci varchar(384) 3.0000 information_schema ROUTINES CHARACTER_SET_CLIENT varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) -3.0000 information_schema ROUTINES COLLATION_CONNECTION varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) -3.0000 information_schema ROUTINES DATABASE_COLLATION varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) +3.0000 information_schema ROUTINES COLLATION_CONNECTION varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) +3.0000 information_schema ROUTINES DATABASE_COLLATION varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) 3.0000 information_schema SCHEMATA CATALOG_NAME varchar 512 1536 utf8mb3 utf8mb3_general_ci varchar(512) 3.0000 information_schema SCHEMATA SCHEMA_NAME varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) 3.0000 information_schema SCHEMATA DEFAULT_CHARACTER_SET_NAME varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) -3.0000 information_schema SCHEMATA DEFAULT_COLLATION_NAME varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) +3.0000 information_schema SCHEMATA DEFAULT_COLLATION_NAME varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) 3.0000 information_schema SCHEMATA SQL_PATH varchar 512 1536 utf8mb3 utf8mb3_general_ci varchar(512) 3.0000 information_schema SCHEMATA SCHEMA_COMMENT varchar 1024 3072 utf8mb3 utf8mb3_general_ci varchar(1024) 3.0000 information_schema SCHEMA_PRIVILEGES GRANTEE varchar 385 1155 utf8mb3 utf8mb3_general_ci varchar(385) @@ -942,7 +948,7 @@ NULL information_schema TABLES AUTO_INCREMENT bigint NULL NULL NULL NULL bigint( NULL information_schema TABLES CREATE_TIME datetime NULL NULL NULL NULL datetime NULL information_schema TABLES UPDATE_TIME datetime NULL NULL NULL NULL datetime NULL information_schema TABLES CHECK_TIME datetime NULL NULL NULL NULL datetime -3.0000 information_schema TABLES TABLE_COLLATION varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) +3.0000 information_schema TABLES TABLE_COLLATION varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) NULL information_schema TABLES CHECKSUM bigint NULL NULL NULL NULL bigint(21) unsigned 3.0000 information_schema TABLES CREATE_OPTIONS varchar 2048 6144 utf8mb3 utf8mb3_general_ci varchar(2048) 3.0000 information_schema TABLES TABLE_COMMENT varchar 2048 6144 utf8mb3 utf8mb3_general_ci varchar(2048) @@ -994,8 +1000,8 @@ NULL information_schema TRIGGERS CREATED datetime NULL NULL NULL NULL datetime(2 3.0000 information_schema TRIGGERS SQL_MODE varchar 8192 24576 utf8mb3 utf8mb3_general_ci varchar(8192) 3.0000 information_schema TRIGGERS DEFINER varchar 384 1152 utf8mb3 utf8mb3_general_ci varchar(384) 3.0000 information_schema TRIGGERS CHARACTER_SET_CLIENT varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) -3.0000 information_schema TRIGGERS COLLATION_CONNECTION varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) -3.0000 information_schema TRIGGERS DATABASE_COLLATION varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) +3.0000 information_schema TRIGGERS COLLATION_CONNECTION varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) +3.0000 information_schema TRIGGERS DATABASE_COLLATION varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) 3.0000 information_schema USER_PRIVILEGES GRANTEE varchar 385 1155 utf8mb3 utf8mb3_general_ci varchar(385) 3.0000 information_schema USER_PRIVILEGES TABLE_CATALOG varchar 512 1536 utf8mb3 utf8mb3_general_ci varchar(512) 3.0000 information_schema USER_PRIVILEGES PRIVILEGE_TYPE varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) @@ -1034,5 +1040,5 @@ NULL information_schema USER_STATISTICS MAX_STATEMENT_TIME_EXCEEDED bigint NULL 3.0000 information_schema VIEWS DEFINER varchar 384 1152 utf8mb3 utf8mb3_general_ci varchar(384) 3.0000 information_schema VIEWS SECURITY_TYPE varchar 7 21 utf8mb3 utf8mb3_general_ci varchar(7) 3.0000 information_schema VIEWS CHARACTER_SET_CLIENT varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) -3.0000 information_schema VIEWS COLLATION_CONNECTION varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) +3.0000 information_schema VIEWS COLLATION_CONNECTION varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) 3.0000 information_schema VIEWS ALGORITHM varchar 10 30 utf8mb3 utf8mb3_general_ci varchar(10) diff --git a/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result b/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result index 622f839901f..bb12a0c38df 100644 --- a/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result @@ -21,7 +21,7 @@ def information_schema APPLICABLE_ROLES IS_DEFAULT 4 NULL YES varchar 3 9 NULL N def information_schema APPLICABLE_ROLES IS_GRANTABLE 3 NULL NO varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) NEVER NULL def information_schema APPLICABLE_ROLES ROLE_NAME 2 NULL NO varchar 128 384 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(128) NEVER NULL def information_schema CHARACTER_SETS CHARACTER_SET_NAME 1 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) NEVER NULL -def information_schema CHARACTER_SETS DEFAULT_COLLATE_NAME 2 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) NEVER NULL +def information_schema CHARACTER_SETS DEFAULT_COLLATE_NAME 2 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) NEVER NULL def information_schema CHARACTER_SETS DESCRIPTION 3 NULL NO varchar 60 180 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(60) NEVER NULL def information_schema CHARACTER_SETS MAXLEN 4 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(3) NEVER NULL def information_schema CHECK_CONSTRAINTS CHECK_CLAUSE 6 NULL NO longtext 4294967295 4294967295 NULL NULL NULL utf8mb3 utf8mb3_general_ci longtext NEVER NULL @@ -55,18 +55,21 @@ def information_schema CLIENT_STATISTICS SELECT_COMMANDS 15 NULL NO bigint NULL def information_schema CLIENT_STATISTICS TOTAL_CONNECTIONS 2 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(21) NEVER NULL def information_schema CLIENT_STATISTICS TOTAL_SSL_CONNECTIONS 24 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(21) unsigned NEVER NULL def information_schema CLIENT_STATISTICS UPDATE_COMMANDS 16 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(21) NEVER NULL -def information_schema COLLATIONS CHARACTER_SET_NAME 2 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) NEVER NULL -def information_schema COLLATIONS COLLATION_NAME 1 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) NEVER NULL -def information_schema COLLATIONS ID 3 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(11) NEVER NULL +def information_schema COLLATIONS CHARACTER_SET_NAME 2 NULL YES varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) NEVER NULL +def information_schema COLLATIONS COLLATION_NAME 1 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) NEVER NULL +def information_schema COLLATIONS ID 3 NULL YES bigint NULL NULL 19 0 NULL NULL NULL bigint(11) NEVER NULL def information_schema COLLATIONS IS_COMPILED 5 NULL NO varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) NEVER NULL -def information_schema COLLATIONS IS_DEFAULT 4 NULL NO varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) NEVER NULL +def information_schema COLLATIONS IS_DEFAULT 4 NULL YES varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) NEVER NULL def information_schema COLLATIONS SORTLEN 6 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(3) NEVER NULL def information_schema COLLATION_CHARACTER_SET_APPLICABILITY CHARACTER_SET_NAME 2 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) NEVER NULL -def information_schema COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME 1 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) NEVER NULL +def information_schema COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME 1 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) NEVER NULL +def information_schema COLLATION_CHARACTER_SET_APPLICABILITY FULL_COLLATION_NAME 3 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) NEVER NULL +def information_schema COLLATION_CHARACTER_SET_APPLICABILITY ID 4 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(11) NEVER NULL +def information_schema COLLATION_CHARACTER_SET_APPLICABILITY IS_DEFAULT 5 NULL NO varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) NEVER NULL def information_schema COLUMNS CHARACTER_MAXIMUM_LENGTH 9 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(21) unsigned NEVER NULL def information_schema COLUMNS CHARACTER_OCTET_LENGTH 10 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(21) unsigned NEVER NULL def information_schema COLUMNS CHARACTER_SET_NAME 14 NULL YES varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) NEVER NULL -def information_schema COLUMNS COLLATION_NAME 15 NULL YES varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) NEVER NULL +def information_schema COLUMNS COLLATION_NAME 15 NULL YES varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) NEVER NULL def information_schema COLUMNS COLUMN_COMMENT 20 NULL NO varchar 1024 3072 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(1024) NEVER NULL def information_schema COLUMNS COLUMN_DEFAULT 6 NULL YES longtext 4294967295 4294967295 NULL NULL NULL utf8mb3 utf8mb3_general_ci longtext NEVER NULL def information_schema COLUMNS COLUMN_KEY 17 NULL NO varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) NEVER NULL @@ -100,9 +103,9 @@ def information_schema ENGINES SUPPORT 2 NULL NO varchar 8 24 NULL NULL NULL utf def information_schema ENGINES TRANSACTIONS 4 NULL YES varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) NEVER NULL def information_schema ENGINES XA 5 NULL YES varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) NEVER NULL def information_schema EVENTS CHARACTER_SET_CLIENT 22 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) NEVER NULL -def information_schema EVENTS COLLATION_CONNECTION 23 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) NEVER NULL +def information_schema EVENTS COLLATION_CONNECTION 23 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) NEVER NULL def information_schema EVENTS CREATED 17 NULL NO datetime NULL NULL NULL NULL 0 NULL NULL datetime NEVER NULL -def information_schema EVENTS DATABASE_COLLATION 24 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) NEVER NULL +def information_schema EVENTS DATABASE_COLLATION 24 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) NEVER NULL def information_schema EVENTS DEFINER 4 NULL NO varchar 384 1152 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(384) NEVER NULL def information_schema EVENTS ENDS 14 NULL YES datetime NULL NULL NULL NULL 0 NULL NULL datetime NEVER NULL def information_schema EVENTS EVENT_BODY 6 NULL NO varchar 8 24 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(8) NEVER NULL @@ -298,10 +301,10 @@ def information_schema ROUTINES CHARACTER_MAXIMUM_LENGTH 7 NULL YES int NULL NUL def information_schema ROUTINES CHARACTER_OCTET_LENGTH 8 NULL YES int NULL NULL 10 0 NULL NULL NULL int(21) NEVER NULL def information_schema ROUTINES CHARACTER_SET_CLIENT 29 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) NEVER NULL def information_schema ROUTINES CHARACTER_SET_NAME 12 NULL YES varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) NEVER NULL -def information_schema ROUTINES COLLATION_CONNECTION 30 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) NEVER NULL +def information_schema ROUTINES COLLATION_CONNECTION 30 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) NEVER NULL def information_schema ROUTINES COLLATION_NAME 13 NULL YES varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) NEVER NULL def information_schema ROUTINES CREATED 24 NULL NO datetime NULL NULL NULL NULL 0 NULL NULL datetime NEVER NULL -def information_schema ROUTINES DATABASE_COLLATION 31 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) NEVER NULL +def information_schema ROUTINES DATABASE_COLLATION 31 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) NEVER NULL def information_schema ROUTINES DATA_TYPE 6 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) NEVER NULL def information_schema ROUTINES DATETIME_PRECISION 11 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(21) unsigned NEVER NULL def information_schema ROUTINES DEFINER 28 NULL NO varchar 384 1152 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(384) NEVER NULL @@ -327,7 +330,7 @@ def information_schema ROUTINES SQL_MODE 26 NULL NO varchar 8192 24576 NULL NULL def information_schema ROUTINES SQL_PATH 22 NULL YES varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) NEVER NULL def information_schema SCHEMATA CATALOG_NAME 1 NULL NO varchar 512 1536 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(512) NEVER NULL def information_schema SCHEMATA DEFAULT_CHARACTER_SET_NAME 3 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) NEVER NULL -def information_schema SCHEMATA DEFAULT_COLLATION_NAME 4 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) NEVER NULL +def information_schema SCHEMATA DEFAULT_COLLATION_NAME 4 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) NEVER NULL def information_schema SCHEMATA SCHEMA_COMMENT 6 NULL NO varchar 1024 3072 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(1024) NEVER NULL def information_schema SCHEMATA SCHEMA_NAME 2 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) NEVER NULL def information_schema SCHEMATA SQL_PATH 5 NULL YES varchar 512 1536 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(512) NEVER NULL @@ -391,7 +394,7 @@ def information_schema TABLES MAX_DATA_LENGTH 11 NULL YES bigint NULL NULL 20 0 def information_schema TABLES MAX_INDEX_LENGTH 22 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(21) unsigned NEVER NULL def information_schema TABLES ROW_FORMAT 7 NULL YES varchar 10 30 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(10) NEVER NULL def information_schema TABLES TABLE_CATALOG 1 NULL NO varchar 512 1536 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(512) NEVER NULL -def information_schema TABLES TABLE_COLLATION 18 NULL YES varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) NEVER NULL +def information_schema TABLES TABLE_COLLATION 18 NULL YES varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) NEVER NULL def information_schema TABLES TABLE_COMMENT 21 NULL NO varchar 2048 6144 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(2048) NEVER NULL def information_schema TABLES TABLE_NAME 3 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) NEVER NULL def information_schema TABLES TABLE_ROWS 8 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(21) unsigned NEVER NULL @@ -436,9 +439,9 @@ def information_schema TRIGGERS ACTION_REFERENCE_OLD_TABLE 13 NULL YES varchar 6 def information_schema TRIGGERS ACTION_STATEMENT 10 NULL NO longtext 4294967295 4294967295 NULL NULL NULL utf8mb3 utf8mb3_general_ci longtext NEVER NULL def information_schema TRIGGERS ACTION_TIMING 12 NULL NO varchar 6 18 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(6) NEVER NULL def information_schema TRIGGERS CHARACTER_SET_CLIENT 20 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) NEVER NULL -def information_schema TRIGGERS COLLATION_CONNECTION 21 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) NEVER NULL +def information_schema TRIGGERS COLLATION_CONNECTION 21 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) NEVER NULL def information_schema TRIGGERS CREATED 17 NULL YES datetime NULL NULL NULL NULL 2 NULL NULL datetime(2) NEVER NULL -def information_schema TRIGGERS DATABASE_COLLATION 22 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) NEVER NULL +def information_schema TRIGGERS DATABASE_COLLATION 22 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) NEVER NULL def information_schema TRIGGERS DEFINER 19 NULL NO varchar 384 1152 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(384) NEVER NULL def information_schema TRIGGERS EVENT_MANIPULATION 4 NULL NO varchar 6 18 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(6) NEVER NULL def information_schema TRIGGERS EVENT_OBJECT_CATALOG 5 NULL NO varchar 512 1536 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(512) NEVER NULL @@ -480,7 +483,7 @@ def information_schema USER_STATISTICS USER 1 NULL NO varchar 128 384 NULL NULL def information_schema VIEWS ALGORITHM 11 NULL NO varchar 10 30 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(10) NEVER NULL def information_schema VIEWS CHARACTER_SET_CLIENT 9 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) NEVER NULL def information_schema VIEWS CHECK_OPTION 5 NULL NO varchar 8 24 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(8) NEVER NULL -def information_schema VIEWS COLLATION_CONNECTION 10 NULL NO varchar 32 96 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(32) NEVER NULL +def information_schema VIEWS COLLATION_CONNECTION 10 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) NEVER NULL def information_schema VIEWS DEFINER 7 NULL NO varchar 384 1152 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(384) NEVER NULL def information_schema VIEWS IS_UPDATABLE 6 NULL NO varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) NEVER NULL def information_schema VIEWS SECURITY_TYPE 8 NULL NO varchar 7 21 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(7) NEVER NULL @@ -569,7 +572,7 @@ COL_CML TABLE_SCHEMA TABLE_NAME COLUMN_NAME DATA_TYPE CHARACTER_MAXIMUM_LENGTH C 3.0000 information_schema APPLICABLE_ROLES IS_GRANTABLE varchar 3 9 utf8mb3 utf8mb3_general_ci varchar(3) 3.0000 information_schema APPLICABLE_ROLES IS_DEFAULT varchar 3 9 utf8mb3 utf8mb3_general_ci varchar(3) 3.0000 information_schema CHARACTER_SETS CHARACTER_SET_NAME varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) -3.0000 information_schema CHARACTER_SETS DEFAULT_COLLATE_NAME varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) +3.0000 information_schema CHARACTER_SETS DEFAULT_COLLATE_NAME varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) 3.0000 information_schema CHARACTER_SETS DESCRIPTION varchar 60 180 utf8mb3 utf8mb3_general_ci varchar(60) NULL information_schema CHARACTER_SETS MAXLEN bigint NULL NULL NULL NULL bigint(3) 3.0000 information_schema CHECK_CONSTRAINTS CONSTRAINT_CATALOG varchar 512 1536 utf8mb3 utf8mb3_general_ci varchar(512) @@ -603,14 +606,17 @@ NULL information_schema CLIENT_STATISTICS ACCESS_DENIED bigint NULL NULL NULL NU NULL information_schema CLIENT_STATISTICS EMPTY_QUERIES bigint NULL NULL NULL NULL bigint(21) NULL information_schema CLIENT_STATISTICS TOTAL_SSL_CONNECTIONS bigint NULL NULL NULL NULL bigint(21) unsigned NULL information_schema CLIENT_STATISTICS MAX_STATEMENT_TIME_EXCEEDED bigint NULL NULL NULL NULL bigint(21) -3.0000 information_schema COLLATIONS COLLATION_NAME varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) +3.0000 information_schema COLLATIONS COLLATION_NAME varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) 3.0000 information_schema COLLATIONS CHARACTER_SET_NAME varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) NULL information_schema COLLATIONS ID bigint NULL NULL NULL NULL bigint(11) 3.0000 information_schema COLLATIONS IS_DEFAULT varchar 3 9 utf8mb3 utf8mb3_general_ci varchar(3) 3.0000 information_schema COLLATIONS IS_COMPILED varchar 3 9 utf8mb3 utf8mb3_general_ci varchar(3) NULL information_schema COLLATIONS SORTLEN bigint NULL NULL NULL NULL bigint(3) -3.0000 information_schema COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) +3.0000 information_schema COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) 3.0000 information_schema COLLATION_CHARACTER_SET_APPLICABILITY CHARACTER_SET_NAME varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) +3.0000 information_schema COLLATION_CHARACTER_SET_APPLICABILITY FULL_COLLATION_NAME varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) +NULL information_schema COLLATION_CHARACTER_SET_APPLICABILITY ID bigint NULL NULL NULL NULL bigint(11) +3.0000 information_schema COLLATION_CHARACTER_SET_APPLICABILITY IS_DEFAULT varchar 3 9 utf8mb3 utf8mb3_general_ci varchar(3) 3.0000 information_schema COLUMNS TABLE_CATALOG varchar 512 1536 utf8mb3 utf8mb3_general_ci varchar(512) 3.0000 information_schema COLUMNS TABLE_SCHEMA varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) 3.0000 information_schema COLUMNS TABLE_NAME varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) @@ -625,7 +631,7 @@ NULL information_schema COLUMNS NUMERIC_PRECISION bigint NULL NULL NULL NULL big NULL information_schema COLUMNS NUMERIC_SCALE bigint NULL NULL NULL NULL bigint(21) unsigned NULL information_schema COLUMNS DATETIME_PRECISION bigint NULL NULL NULL NULL bigint(21) unsigned 3.0000 information_schema COLUMNS CHARACTER_SET_NAME varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) -3.0000 information_schema COLUMNS COLLATION_NAME varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) +3.0000 information_schema COLUMNS COLLATION_NAME varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) 1.0000 information_schema COLUMNS COLUMN_TYPE longtext 4294967295 4294967295 utf8mb3 utf8mb3_general_ci longtext 3.0000 information_schema COLUMNS COLUMN_KEY varchar 3 9 utf8mb3 utf8mb3_general_ci varchar(3) 3.0000 information_schema COLUMNS EXTRA varchar 80 240 utf8mb3 utf8mb3_general_ci varchar(80) @@ -669,8 +675,8 @@ NULL information_schema EVENTS LAST_EXECUTED datetime NULL NULL NULL NULL dateti 3.0000 information_schema EVENTS EVENT_COMMENT varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) NULL information_schema EVENTS ORIGINATOR bigint NULL NULL NULL NULL bigint(10) 3.0000 information_schema EVENTS CHARACTER_SET_CLIENT varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) -3.0000 information_schema EVENTS COLLATION_CONNECTION varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) -3.0000 information_schema EVENTS DATABASE_COLLATION varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) +3.0000 information_schema EVENTS COLLATION_CONNECTION varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) +3.0000 information_schema EVENTS DATABASE_COLLATION varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) NULL information_schema FILES FILE_ID bigint NULL NULL NULL NULL bigint(4) 3.0000 information_schema FILES FILE_NAME varchar 512 1536 utf8mb3 utf8mb3_general_ci varchar(512) 3.0000 information_schema FILES FILE_TYPE varchar 20 60 utf8mb3 utf8mb3_general_ci varchar(20) @@ -871,12 +877,12 @@ NULL information_schema ROUTINES LAST_ALTERED datetime NULL NULL NULL NULL datet 1.0000 information_schema ROUTINES ROUTINE_COMMENT longtext 4294967295 4294967295 utf8mb3 utf8mb3_general_ci longtext 3.0000 information_schema ROUTINES DEFINER varchar 384 1152 utf8mb3 utf8mb3_general_ci varchar(384) 3.0000 information_schema ROUTINES CHARACTER_SET_CLIENT varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) -3.0000 information_schema ROUTINES COLLATION_CONNECTION varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) -3.0000 information_schema ROUTINES DATABASE_COLLATION varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) +3.0000 information_schema ROUTINES COLLATION_CONNECTION varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) +3.0000 information_schema ROUTINES DATABASE_COLLATION varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) 3.0000 information_schema SCHEMATA CATALOG_NAME varchar 512 1536 utf8mb3 utf8mb3_general_ci varchar(512) 3.0000 information_schema SCHEMATA SCHEMA_NAME varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) 3.0000 information_schema SCHEMATA DEFAULT_CHARACTER_SET_NAME varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) -3.0000 information_schema SCHEMATA DEFAULT_COLLATION_NAME varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) +3.0000 information_schema SCHEMATA DEFAULT_COLLATION_NAME varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) 3.0000 information_schema SCHEMATA SQL_PATH varchar 512 1536 utf8mb3 utf8mb3_general_ci varchar(512) 3.0000 information_schema SCHEMATA SCHEMA_COMMENT varchar 1024 3072 utf8mb3 utf8mb3_general_ci varchar(1024) 3.0000 information_schema SCHEMA_PRIVILEGES GRANTEE varchar 385 1155 utf8mb3 utf8mb3_general_ci varchar(385) @@ -942,7 +948,7 @@ NULL information_schema TABLES AUTO_INCREMENT bigint NULL NULL NULL NULL bigint( NULL information_schema TABLES CREATE_TIME datetime NULL NULL NULL NULL datetime NULL information_schema TABLES UPDATE_TIME datetime NULL NULL NULL NULL datetime NULL information_schema TABLES CHECK_TIME datetime NULL NULL NULL NULL datetime -3.0000 information_schema TABLES TABLE_COLLATION varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) +3.0000 information_schema TABLES TABLE_COLLATION varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) NULL information_schema TABLES CHECKSUM bigint NULL NULL NULL NULL bigint(21) unsigned 3.0000 information_schema TABLES CREATE_OPTIONS varchar 2048 6144 utf8mb3 utf8mb3_general_ci varchar(2048) 3.0000 information_schema TABLES TABLE_COMMENT varchar 2048 6144 utf8mb3 utf8mb3_general_ci varchar(2048) @@ -994,8 +1000,8 @@ NULL information_schema TRIGGERS CREATED datetime NULL NULL NULL NULL datetime(2 3.0000 information_schema TRIGGERS SQL_MODE varchar 8192 24576 utf8mb3 utf8mb3_general_ci varchar(8192) 3.0000 information_schema TRIGGERS DEFINER varchar 384 1152 utf8mb3 utf8mb3_general_ci varchar(384) 3.0000 information_schema TRIGGERS CHARACTER_SET_CLIENT varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) -3.0000 information_schema TRIGGERS COLLATION_CONNECTION varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) -3.0000 information_schema TRIGGERS DATABASE_COLLATION varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) +3.0000 information_schema TRIGGERS COLLATION_CONNECTION varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) +3.0000 information_schema TRIGGERS DATABASE_COLLATION varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) 3.0000 information_schema USER_PRIVILEGES GRANTEE varchar 385 1155 utf8mb3 utf8mb3_general_ci varchar(385) 3.0000 information_schema USER_PRIVILEGES TABLE_CATALOG varchar 512 1536 utf8mb3 utf8mb3_general_ci varchar(512) 3.0000 information_schema USER_PRIVILEGES PRIVILEGE_TYPE varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) @@ -1034,5 +1040,5 @@ NULL information_schema USER_STATISTICS MAX_STATEMENT_TIME_EXCEEDED bigint NULL 3.0000 information_schema VIEWS DEFINER varchar 384 1152 utf8mb3 utf8mb3_general_ci varchar(384) 3.0000 information_schema VIEWS SECURITY_TYPE varchar 7 21 utf8mb3 utf8mb3_general_ci varchar(7) 3.0000 information_schema VIEWS CHARACTER_SET_CLIENT varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) -3.0000 information_schema VIEWS COLLATION_CONNECTION varchar 32 96 utf8mb3 utf8mb3_general_ci varchar(32) +3.0000 information_schema VIEWS COLLATION_CONNECTION varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64) 3.0000 information_schema VIEWS ALGORITHM varchar 10 30 utf8mb3 utf8mb3_general_ci varchar(10) diff --git a/mysql-test/suite/funcs_1/r/is_columns_mysql.result b/mysql-test/suite/funcs_1/r/is_columns_mysql.result index b50ae58df28..dbcead827ee 100644 --- a/mysql-test/suite/funcs_1/r/is_columns_mysql.result +++ b/mysql-test/suite/funcs_1/r/is_columns_mysql.result @@ -46,11 +46,11 @@ def mysql db User 3 '' NO char 128 384 NULL NULL NULL utf8mb3 utf8mb3_bin char(1 def mysql event body 3 NULL NO longblob 4294967295 4294967295 NULL NULL NULL NULL NULL longblob select,insert,update,references NEVER NULL def mysql event body_utf8 22 NULL YES longblob 4294967295 4294967295 NULL NULL NULL NULL NULL longblob select,insert,update,references NEVER NULL def mysql event character_set_client 19 NULL YES char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) select,insert,update,references NEVER NULL -def mysql event collation_connection 20 NULL YES char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) select,insert,update,references NEVER NULL +def mysql event collation_connection 20 NULL YES char 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin char(64) select,insert,update,references NEVER NULL def mysql event comment 16 '' NO char 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin char(64) select,insert,update,references NEVER NULL def mysql event created 8 current_timestamp() NO timestamp NULL NULL NULL NULL 0 NULL NULL timestamp on update current_timestamp() select,insert,update,references NEVER NULL def mysql event db 1 '' NO char 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin char(64) PRI select,insert,update,references NEVER NULL -def mysql event db_collation 21 NULL YES char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) select,insert,update,references NEVER NULL +def mysql event db_collation 21 NULL YES char 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin char(64) select,insert,update,references NEVER NULL def mysql event definer 4 '' NO varchar 384 1152 NULL NULL NULL utf8mb3 utf8mb3_bin varchar(384) select,insert,update,references NEVER NULL def mysql event ends 12 NULL YES datetime NULL NULL NULL NULL 0 NULL NULL datetime select,insert,update,references NEVER NULL def mysql event execute_at 5 NULL YES datetime NULL NULL NULL NULL 0 NULL NULL datetime select,insert,update,references NEVER NULL @@ -121,11 +121,11 @@ def mysql proc aggregate 21 'NONE' NO enum 5 15 NULL NULL NULL utf8mb3 utf8mb3_g def mysql proc body 11 NULL NO longblob 4294967295 4294967295 NULL NULL NULL NULL NULL longblob select,insert,update,references NEVER NULL def mysql proc body_utf8 20 NULL YES longblob 4294967295 4294967295 NULL NULL NULL NULL NULL longblob select,insert,update,references NEVER NULL def mysql proc character_set_client 17 NULL YES char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) select,insert,update,references NEVER NULL -def mysql proc collation_connection 18 NULL YES char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) select,insert,update,references NEVER NULL +def mysql proc collation_connection 18 NULL YES char 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin char(64) select,insert,update,references NEVER NULL def mysql proc comment 16 NULL NO text 65535 65535 NULL NULL NULL utf8mb3 utf8mb3_bin text select,insert,update,references NEVER NULL def mysql proc created 13 current_timestamp() NO timestamp NULL NULL NULL NULL 0 NULL NULL timestamp on update current_timestamp() select,insert,update,references NEVER NULL def mysql proc db 1 '' NO char 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin char(64) PRI select,insert,update,references NEVER NULL -def mysql proc db_collation 19 NULL YES char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) select,insert,update,references NEVER NULL +def mysql proc db_collation 19 NULL YES char 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin char(64) select,insert,update,references NEVER NULL def mysql proc definer 12 '' NO varchar 384 1152 NULL NULL NULL utf8mb3 utf8mb3_bin varchar(384) select,insert,update,references NEVER NULL def mysql proc is_deterministic 7 'NO' NO enum 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci enum('YES','NO') select,insert,update,references NEVER NULL def mysql proc language 5 'SQL' NO enum 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci enum('SQL') select,insert,update,references NEVER NULL @@ -389,8 +389,8 @@ NULL mysql event ends datetime NULL NULL NULL NULL datetime NULL mysql event originator int NULL NULL NULL NULL int(10) unsigned 1.0000 mysql event time_zone char 64 64 latin1 latin1_swedish_ci char(64) 3.0000 mysql event character_set_client char 32 96 utf8mb3 utf8mb3_bin char(32) -3.0000 mysql event collation_connection char 32 96 utf8mb3 utf8mb3_bin char(32) -3.0000 mysql event db_collation char 32 96 utf8mb3 utf8mb3_bin char(32) +3.0000 mysql event collation_connection char 64 192 utf8mb3 utf8mb3_bin char(64) +3.0000 mysql event db_collation char 64 192 utf8mb3 utf8mb3_bin char(64) 1.0000 mysql event body_utf8 longblob 4294967295 4294967295 NULL NULL longblob 3.0000 mysql func name char 64 192 utf8mb3 utf8mb3_bin char(64) NULL mysql func ret tinyint NULL NULL NULL NULL tinyint(1) @@ -461,8 +461,8 @@ NULL mysql proc modified timestamp NULL NULL NULL NULL timestamp 3.0000 mysql proc sql_mode set 561 1683 utf8mb3 utf8mb3_general_ci set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','IGNORE_BAD_TABLE_OPTIONS','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH','EMPTY_STRING_IS_NULL','SIMULTANEOUS_ASSIGNMENT','TIME_ROUND_FRACTIONAL') 1.0000 mysql proc comment text 65535 65535 utf8mb3 utf8mb3_bin text 3.0000 mysql proc character_set_client char 32 96 utf8mb3 utf8mb3_bin char(32) -3.0000 mysql proc collation_connection char 32 96 utf8mb3 utf8mb3_bin char(32) -3.0000 mysql proc db_collation char 32 96 utf8mb3 utf8mb3_bin char(32) +3.0000 mysql proc collation_connection char 64 192 utf8mb3 utf8mb3_bin char(64) +3.0000 mysql proc db_collation char 64 192 utf8mb3 utf8mb3_bin char(64) 1.0000 mysql proc body_utf8 longblob 4294967295 4294967295 NULL NULL longblob 3.0000 mysql proc aggregate enum 5 15 utf8mb3 utf8mb3_general_ci enum('NONE','GROUP') 3.0000 mysql procs_priv Host char 255 765 utf8mb3 utf8mb3_bin char(255) diff --git a/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result b/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result index 96751dfd176..d609a2f4b73 100644 --- a/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result @@ -46,11 +46,11 @@ def mysql db User 3 '' NO char 128 384 NULL NULL NULL utf8mb3 utf8mb3_bin char(1 def mysql event body 3 NULL NO longblob 4294967295 4294967295 NULL NULL NULL NULL NULL longblob NEVER NULL def mysql event body_utf8 22 NULL YES longblob 4294967295 4294967295 NULL NULL NULL NULL NULL longblob NEVER NULL def mysql event character_set_client 19 NULL YES char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) NEVER NULL -def mysql event collation_connection 20 NULL YES char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) NEVER NULL +def mysql event collation_connection 20 NULL YES char 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin char(64) NEVER NULL def mysql event comment 16 '' NO char 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin char(64) NEVER NULL def mysql event created 8 current_timestamp() NO timestamp NULL NULL NULL NULL 0 NULL NULL timestamp on update current_timestamp() NEVER NULL def mysql event db 1 '' NO char 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin char(64) PRI NEVER NULL -def mysql event db_collation 21 NULL YES char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) NEVER NULL +def mysql event db_collation 21 NULL YES char 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin char(64) NEVER NULL def mysql event definer 4 '' NO varchar 384 1152 NULL NULL NULL utf8mb3 utf8mb3_bin varchar(384) NEVER NULL def mysql event ends 12 NULL YES datetime NULL NULL NULL NULL 0 NULL NULL datetime NEVER NULL def mysql event execute_at 5 NULL YES datetime NULL NULL NULL NULL 0 NULL NULL datetime NEVER NULL @@ -107,11 +107,11 @@ def mysql proc aggregate 21 'NONE' NO enum 5 15 NULL NULL NULL utf8mb3 utf8mb3_g def mysql proc body 11 NULL NO longblob 4294967295 4294967295 NULL NULL NULL NULL NULL longblob NEVER NULL def mysql proc body_utf8 20 NULL YES longblob 4294967295 4294967295 NULL NULL NULL NULL NULL longblob NEVER NULL def mysql proc character_set_client 17 NULL YES char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) NEVER NULL -def mysql proc collation_connection 18 NULL YES char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) NEVER NULL +def mysql proc collation_connection 18 NULL YES char 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin char(64) NEVER NULL def mysql proc comment 16 NULL NO text 65535 65535 NULL NULL NULL utf8mb3 utf8mb3_bin text NEVER NULL def mysql proc created 13 current_timestamp() NO timestamp NULL NULL NULL NULL 0 NULL NULL timestamp on update current_timestamp() NEVER NULL def mysql proc db 1 '' NO char 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin char(64) PRI NEVER NULL -def mysql proc db_collation 19 NULL YES char 32 96 NULL NULL NULL utf8mb3 utf8mb3_bin char(32) NEVER NULL +def mysql proc db_collation 19 NULL YES char 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin char(64) NEVER NULL def mysql proc definer 12 '' NO varchar 384 1152 NULL NULL NULL utf8mb3 utf8mb3_bin varchar(384) NEVER NULL def mysql proc is_deterministic 7 'NO' NO enum 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci enum('YES','NO') NEVER NULL def mysql proc language 5 'SQL' NO enum 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci enum('SQL') NEVER NULL @@ -386,8 +386,8 @@ NULL mysql event ends datetime NULL NULL NULL NULL datetime NULL mysql event originator int NULL NULL NULL NULL int(10) unsigned 1.0000 mysql event time_zone char 64 64 latin1 latin1_swedish_ci char(64) 3.0000 mysql event character_set_client char 32 96 utf8mb3 utf8mb3_bin char(32) -3.0000 mysql event collation_connection char 32 96 utf8mb3 utf8mb3_bin char(32) -3.0000 mysql event db_collation char 32 96 utf8mb3 utf8mb3_bin char(32) +3.0000 mysql event collation_connection char 64 192 utf8mb3 utf8mb3_bin char(64) +3.0000 mysql event db_collation char 64 192 utf8mb3 utf8mb3_bin char(64) 1.0000 mysql event body_utf8 longblob 4294967295 4294967295 NULL NULL longblob 3.0000 mysql func name char 64 192 utf8mb3 utf8mb3_bin char(64) NULL mysql func ret tinyint NULL NULL NULL NULL tinyint(1) @@ -444,8 +444,8 @@ NULL mysql proc modified timestamp NULL NULL NULL NULL timestamp 3.0000 mysql proc sql_mode set 561 1683 utf8mb3 utf8mb3_general_ci set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','IGNORE_BAD_TABLE_OPTIONS','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH','EMPTY_STRING_IS_NULL','SIMULTANEOUS_ASSIGNMENT','TIME_ROUND_FRACTIONAL') 1.0000 mysql proc comment text 65535 65535 utf8mb3 utf8mb3_bin text 3.0000 mysql proc character_set_client char 32 96 utf8mb3 utf8mb3_bin char(32) -3.0000 mysql proc collation_connection char 32 96 utf8mb3 utf8mb3_bin char(32) -3.0000 mysql proc db_collation char 32 96 utf8mb3 utf8mb3_bin char(32) +3.0000 mysql proc collation_connection char 64 192 utf8mb3 utf8mb3_bin char(64) +3.0000 mysql proc db_collation char 64 192 utf8mb3 utf8mb3_bin char(64) 1.0000 mysql proc body_utf8 longblob 4294967295 4294967295 NULL NULL longblob 3.0000 mysql proc aggregate enum 5 15 utf8mb3 utf8mb3_general_ci enum('NONE','GROUP') 3.0000 mysql procs_priv Host char 255 765 utf8mb3 utf8mb3_bin char(255) diff --git a/mysql-test/suite/funcs_1/r/is_events.result b/mysql-test/suite/funcs_1/r/is_events.result index a597d43f0ea..7df12ee2771 100644 --- a/mysql-test/suite/funcs_1/r/is_events.result +++ b/mysql-test/suite/funcs_1/r/is_events.result @@ -50,8 +50,8 @@ LAST_EXECUTED datetime YES NULL EVENT_COMMENT varchar(64) NO NULL ORIGINATOR bigint(10) NO NULL CHARACTER_SET_CLIENT varchar(32) NO NULL -COLLATION_CONNECTION varchar(32) NO NULL -DATABASE_COLLATION varchar(32) NO NULL +COLLATION_CONNECTION varchar(64) NO NULL +DATABASE_COLLATION varchar(64) NO NULL SHOW CREATE TABLE information_schema.EVENTS; Table Create Table EVENTS CREATE TEMPORARY TABLE `EVENTS` ( @@ -77,8 +77,8 @@ EVENTS CREATE TEMPORARY TABLE `EVENTS` ( `EVENT_COMMENT` varchar(64) NOT NULL, `ORIGINATOR` bigint(10) NOT NULL, `CHARACTER_SET_CLIENT` varchar(32) NOT NULL, - `COLLATION_CONNECTION` varchar(32) NOT NULL, - `DATABASE_COLLATION` varchar(32) NOT NULL + `COLLATION_CONNECTION` varchar(64) NOT NULL, + `DATABASE_COLLATION` varchar(64) NOT NULL ) DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SHOW COLUMNS FROM information_schema.EVENTS; Field Type Null Key Default Extra @@ -104,8 +104,8 @@ LAST_EXECUTED datetime YES NULL EVENT_COMMENT varchar(64) NO NULL ORIGINATOR bigint(10) NO NULL CHARACTER_SET_CLIENT varchar(32) NO NULL -COLLATION_CONNECTION varchar(32) NO NULL -DATABASE_COLLATION varchar(32) NO NULL +COLLATION_CONNECTION varchar(64) NO NULL +DATABASE_COLLATION varchar(64) NO NULL SELECT event_catalog, event_name, event_body, event_type, event_type, status, on_completion FROM information_schema.events diff --git a/mysql-test/suite/funcs_1/r/is_routines.result b/mysql-test/suite/funcs_1/r/is_routines.result index a1931a964ce..1b293444b27 100644 --- a/mysql-test/suite/funcs_1/r/is_routines.result +++ b/mysql-test/suite/funcs_1/r/is_routines.result @@ -58,8 +58,8 @@ SQL_MODE varchar(8192) NO NULL ROUTINE_COMMENT longtext NO NULL DEFINER varchar(384) NO NULL CHARACTER_SET_CLIENT varchar(32) NO NULL -COLLATION_CONNECTION varchar(32) NO NULL -DATABASE_COLLATION varchar(32) NO NULL +COLLATION_CONNECTION varchar(64) NO NULL +DATABASE_COLLATION varchar(64) NO NULL SHOW CREATE TABLE information_schema.ROUTINES; Table Create Table ROUTINES CREATE TEMPORARY TABLE `ROUTINES` ( @@ -92,8 +92,8 @@ ROUTINES CREATE TEMPORARY TABLE `ROUTINES` ( `ROUTINE_COMMENT` longtext NOT NULL, `DEFINER` varchar(384) NOT NULL, `CHARACTER_SET_CLIENT` varchar(32) NOT NULL, - `COLLATION_CONNECTION` varchar(32) NOT NULL, - `DATABASE_COLLATION` varchar(32) NOT NULL + `COLLATION_CONNECTION` varchar(64) NOT NULL, + `DATABASE_COLLATION` varchar(64) NOT NULL ) DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SHOW COLUMNS FROM information_schema.ROUTINES; Field Type Null Key Default Extra @@ -126,8 +126,8 @@ SQL_MODE varchar(8192) NO NULL ROUTINE_COMMENT longtext NO NULL DEFINER varchar(384) NO NULL CHARACTER_SET_CLIENT varchar(32) NO NULL -COLLATION_CONNECTION varchar(32) NO NULL -DATABASE_COLLATION varchar(32) NO NULL +COLLATION_CONNECTION varchar(64) NO NULL +DATABASE_COLLATION varchar(64) NO NULL USE test; DROP PROCEDURE IF EXISTS sp_for_routines; DROP FUNCTION IF EXISTS function_for_routines; diff --git a/mysql-test/suite/funcs_1/r/is_routines_embedded.result b/mysql-test/suite/funcs_1/r/is_routines_embedded.result index dba5e7f330e..dfd663a6a96 100644 --- a/mysql-test/suite/funcs_1/r/is_routines_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_routines_embedded.result @@ -58,8 +58,8 @@ SQL_MODE varchar(8192) NO NULL ROUTINE_COMMENT longtext NO NULL DEFINER varchar(384) NO NULL CHARACTER_SET_CLIENT varchar(32) NO NULL -COLLATION_CONNECTION varchar(32) NO NULL -DATABASE_COLLATION varchar(32) NO NULL +COLLATION_CONNECTION varchar(64) NO NULL +DATABASE_COLLATION varchar(64) NO NULL SHOW CREATE TABLE information_schema.ROUTINES; Table Create Table ROUTINES CREATE TEMPORARY TABLE `ROUTINES` ( @@ -92,8 +92,8 @@ ROUTINES CREATE TEMPORARY TABLE `ROUTINES` ( `ROUTINE_COMMENT` longtext NOT NULL, `DEFINER` varchar(384) NOT NULL, `CHARACTER_SET_CLIENT` varchar(32) NOT NULL, - `COLLATION_CONNECTION` varchar(32) NOT NULL, - `DATABASE_COLLATION` varchar(32) NOT NULL + `COLLATION_CONNECTION` varchar(64) NOT NULL, + `DATABASE_COLLATION` varchar(64) NOT NULL ) DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SHOW COLUMNS FROM information_schema.ROUTINES; Field Type Null Key Default Extra @@ -126,8 +126,8 @@ SQL_MODE varchar(8192) NO NULL ROUTINE_COMMENT longtext NO NULL DEFINER varchar(384) NO NULL CHARACTER_SET_CLIENT varchar(32) NO NULL -COLLATION_CONNECTION varchar(32) NO NULL -DATABASE_COLLATION varchar(32) NO NULL +COLLATION_CONNECTION varchar(64) NO NULL +DATABASE_COLLATION varchar(64) NO NULL USE test; DROP PROCEDURE IF EXISTS sp_for_routines; DROP FUNCTION IF EXISTS function_for_routines; diff --git a/mysql-test/suite/funcs_1/r/is_schemata.result b/mysql-test/suite/funcs_1/r/is_schemata.result index 5a12c63fe25..ff33306b8f9 100644 --- a/mysql-test/suite/funcs_1/r/is_schemata.result +++ b/mysql-test/suite/funcs_1/r/is_schemata.result @@ -31,7 +31,7 @@ Field Type Null Key Default Extra CATALOG_NAME varchar(512) NO NULL SCHEMA_NAME varchar(64) NO NULL DEFAULT_CHARACTER_SET_NAME varchar(32) NO NULL -DEFAULT_COLLATION_NAME varchar(32) NO NULL +DEFAULT_COLLATION_NAME varchar(64) NO NULL SQL_PATH varchar(512) YES NULL SCHEMA_COMMENT varchar(1024) NO NULL SHOW CREATE TABLE information_schema.SCHEMATA; @@ -40,7 +40,7 @@ SCHEMATA CREATE TEMPORARY TABLE `SCHEMATA` ( `CATALOG_NAME` varchar(512) NOT NULL, `SCHEMA_NAME` varchar(64) NOT NULL, `DEFAULT_CHARACTER_SET_NAME` varchar(32) NOT NULL, - `DEFAULT_COLLATION_NAME` varchar(32) NOT NULL, + `DEFAULT_COLLATION_NAME` varchar(64) NOT NULL, `SQL_PATH` varchar(512), `SCHEMA_COMMENT` varchar(1024) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci @@ -49,7 +49,7 @@ Field Type Null Key Default Extra CATALOG_NAME varchar(512) NO NULL SCHEMA_NAME varchar(64) NO NULL DEFAULT_CHARACTER_SET_NAME varchar(32) NO NULL -DEFAULT_COLLATION_NAME varchar(32) NO NULL +DEFAULT_COLLATION_NAME varchar(64) NO NULL SQL_PATH varchar(512) YES NULL SCHEMA_COMMENT varchar(1024) NO NULL SELECT catalog_name, schema_name, sql_path diff --git a/mysql-test/suite/funcs_1/r/is_schemata_embedded.result b/mysql-test/suite/funcs_1/r/is_schemata_embedded.result index 0156d6117bd..9f129caa5bf 100644 --- a/mysql-test/suite/funcs_1/r/is_schemata_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_schemata_embedded.result @@ -31,7 +31,7 @@ Field Type Null Key Default Extra CATALOG_NAME varchar(512) NO NULL SCHEMA_NAME varchar(64) NO NULL DEFAULT_CHARACTER_SET_NAME varchar(32) NO NULL -DEFAULT_COLLATION_NAME varchar(32) NO NULL +DEFAULT_COLLATION_NAME varchar(64) NO NULL SQL_PATH varchar(512) YES NULL SCHEMA_COMMENT varchar(1024) NO NULL SHOW CREATE TABLE information_schema.SCHEMATA; @@ -40,7 +40,7 @@ SCHEMATA CREATE TEMPORARY TABLE `SCHEMATA` ( `CATALOG_NAME` varchar(512) NOT NULL, `SCHEMA_NAME` varchar(64) NOT NULL, `DEFAULT_CHARACTER_SET_NAME` varchar(32) NOT NULL, - `DEFAULT_COLLATION_NAME` varchar(32) NOT NULL, + `DEFAULT_COLLATION_NAME` varchar(64) NOT NULL, `SQL_PATH` varchar(512), `SCHEMA_COMMENT` varchar(1024) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci @@ -49,7 +49,7 @@ Field Type Null Key Default Extra CATALOG_NAME varchar(512) NO NULL SCHEMA_NAME varchar(64) NO NULL DEFAULT_CHARACTER_SET_NAME varchar(32) NO NULL -DEFAULT_COLLATION_NAME varchar(32) NO NULL +DEFAULT_COLLATION_NAME varchar(64) NO NULL SQL_PATH varchar(512) YES NULL SCHEMA_COMMENT varchar(1024) NO NULL SELECT catalog_name, schema_name, sql_path diff --git a/mysql-test/suite/funcs_1/r/is_tables.result b/mysql-test/suite/funcs_1/r/is_tables.result index 35daab13c35..35f7d43d437 100644 --- a/mysql-test/suite/funcs_1/r/is_tables.result +++ b/mysql-test/suite/funcs_1/r/is_tables.result @@ -45,7 +45,7 @@ AUTO_INCREMENT bigint(21) unsigned YES NULL CREATE_TIME datetime YES NULL UPDATE_TIME datetime YES NULL CHECK_TIME datetime YES NULL -TABLE_COLLATION varchar(32) YES NULL +TABLE_COLLATION varchar(64) YES NULL CHECKSUM bigint(21) unsigned YES NULL CREATE_OPTIONS varchar(2048) YES NULL TABLE_COMMENT varchar(2048) NO NULL @@ -71,7 +71,7 @@ TABLES CREATE TEMPORARY TABLE `TABLES` ( `CREATE_TIME` datetime, `UPDATE_TIME` datetime, `CHECK_TIME` datetime, - `TABLE_COLLATION` varchar(32), + `TABLE_COLLATION` varchar(64), `CHECKSUM` bigint(21) unsigned, `CREATE_OPTIONS` varchar(2048), `TABLE_COMMENT` varchar(2048) NOT NULL, @@ -97,7 +97,7 @@ AUTO_INCREMENT bigint(21) unsigned YES NULL CREATE_TIME datetime YES NULL UPDATE_TIME datetime YES NULL CHECK_TIME datetime YES NULL -TABLE_COLLATION varchar(32) YES NULL +TABLE_COLLATION varchar(64) YES NULL CHECKSUM bigint(21) unsigned YES NULL CREATE_OPTIONS varchar(2048) YES NULL TABLE_COMMENT varchar(2048) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_tables_embedded.result b/mysql-test/suite/funcs_1/r/is_tables_embedded.result index ab42aed82bd..de0c2fb4804 100644 --- a/mysql-test/suite/funcs_1/r/is_tables_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_tables_embedded.result @@ -45,7 +45,7 @@ AUTO_INCREMENT bigint(21) unsigned YES NULL CREATE_TIME datetime YES NULL UPDATE_TIME datetime YES NULL CHECK_TIME datetime YES NULL -TABLE_COLLATION varchar(32) YES NULL +TABLE_COLLATION varchar(64) YES NULL CHECKSUM bigint(21) unsigned YES NULL CREATE_OPTIONS varchar(2048) YES NULL TABLE_COMMENT varchar(2048) NO NULL @@ -71,7 +71,7 @@ TABLES CREATE TEMPORARY TABLE `TABLES` ( `CREATE_TIME` datetime, `UPDATE_TIME` datetime, `CHECK_TIME` datetime, - `TABLE_COLLATION` varchar(32), + `TABLE_COLLATION` varchar(64), `CHECKSUM` bigint(21) unsigned, `CREATE_OPTIONS` varchar(2048), `TABLE_COMMENT` varchar(2048) NOT NULL, @@ -97,7 +97,7 @@ AUTO_INCREMENT bigint(21) unsigned YES NULL CREATE_TIME datetime YES NULL UPDATE_TIME datetime YES NULL CHECK_TIME datetime YES NULL -TABLE_COLLATION varchar(32) YES NULL +TABLE_COLLATION varchar(64) YES NULL CHECKSUM bigint(21) unsigned YES NULL CREATE_OPTIONS varchar(2048) YES NULL TABLE_COMMENT varchar(2048) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_triggers.result b/mysql-test/suite/funcs_1/r/is_triggers.result index 6a1aed781da..99e514cfed9 100644 --- a/mysql-test/suite/funcs_1/r/is_triggers.result +++ b/mysql-test/suite/funcs_1/r/is_triggers.result @@ -50,8 +50,8 @@ CREATED datetime(2) YES NULL SQL_MODE varchar(8192) NO NULL DEFINER varchar(384) NO NULL CHARACTER_SET_CLIENT varchar(32) NO NULL -COLLATION_CONNECTION varchar(32) NO NULL -DATABASE_COLLATION varchar(32) NO NULL +COLLATION_CONNECTION varchar(64) NO NULL +DATABASE_COLLATION varchar(64) NO NULL SHOW CREATE TABLE information_schema.TRIGGERS; Table Create Table TRIGGERS CREATE TEMPORARY TABLE `TRIGGERS` ( @@ -75,8 +75,8 @@ TRIGGERS CREATE TEMPORARY TABLE `TRIGGERS` ( `SQL_MODE` varchar(8192) NOT NULL, `DEFINER` varchar(384) NOT NULL, `CHARACTER_SET_CLIENT` varchar(32) NOT NULL, - `COLLATION_CONNECTION` varchar(32) NOT NULL, - `DATABASE_COLLATION` varchar(32) NOT NULL + `COLLATION_CONNECTION` varchar(64) NOT NULL, + `DATABASE_COLLATION` varchar(64) NOT NULL ) DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SHOW COLUMNS FROM information_schema.TRIGGERS; Field Type Null Key Default Extra @@ -100,8 +100,8 @@ CREATED datetime(2) YES NULL SQL_MODE varchar(8192) NO NULL DEFINER varchar(384) NO NULL CHARACTER_SET_CLIENT varchar(32) NO NULL -COLLATION_CONNECTION varchar(32) NO NULL -DATABASE_COLLATION varchar(32) NO NULL +COLLATION_CONNECTION varchar(64) NO NULL +DATABASE_COLLATION varchar(64) NO NULL SELECT * FROM information_schema.triggers WHERE trigger_catalog IS NOT NULL OR event_object_catalog IS NOT NULL OR action_condition IS NOT NULL OR action_reference_old_table IS NOT NULL diff --git a/mysql-test/suite/funcs_1/r/is_triggers_embedded.result b/mysql-test/suite/funcs_1/r/is_triggers_embedded.result index a35297899aa..a16493912ad 100644 --- a/mysql-test/suite/funcs_1/r/is_triggers_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_triggers_embedded.result @@ -50,8 +50,8 @@ CREATED datetime(2) YES NULL SQL_MODE varchar(8192) NO NULL DEFINER varchar(384) NO NULL CHARACTER_SET_CLIENT varchar(32) NO NULL -COLLATION_CONNECTION varchar(32) NO NULL -DATABASE_COLLATION varchar(32) NO NULL +COLLATION_CONNECTION varchar(64) NO NULL +DATABASE_COLLATION varchar(64) NO NULL SHOW CREATE TABLE information_schema.TRIGGERS; Table Create Table TRIGGERS CREATE TEMPORARY TABLE `TRIGGERS` ( @@ -75,8 +75,8 @@ TRIGGERS CREATE TEMPORARY TABLE `TRIGGERS` ( `SQL_MODE` varchar(8192) NOT NULL, `DEFINER` varchar(384) NOT NULL, `CHARACTER_SET_CLIENT` varchar(32) NOT NULL, - `COLLATION_CONNECTION` varchar(32) NOT NULL, - `DATABASE_COLLATION` varchar(32) NOT NULL + `COLLATION_CONNECTION` varchar(64) NOT NULL, + `DATABASE_COLLATION` varchar(64) NOT NULL ) DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SHOW COLUMNS FROM information_schema.TRIGGERS; Field Type Null Key Default Extra @@ -100,8 +100,8 @@ CREATED datetime(2) YES NULL SQL_MODE varchar(8192) NO NULL DEFINER varchar(384) NO NULL CHARACTER_SET_CLIENT varchar(32) NO NULL -COLLATION_CONNECTION varchar(32) NO NULL -DATABASE_COLLATION varchar(32) NO NULL +COLLATION_CONNECTION varchar(64) NO NULL +DATABASE_COLLATION varchar(64) NO NULL SELECT * FROM information_schema.triggers WHERE trigger_catalog IS NOT NULL OR event_object_catalog IS NOT NULL OR action_condition IS NOT NULL OR action_reference_old_table IS NOT NULL diff --git a/mysql-test/suite/funcs_1/r/is_views.result b/mysql-test/suite/funcs_1/r/is_views.result index c42e4867d75..97ce2d915d8 100644 --- a/mysql-test/suite/funcs_1/r/is_views.result +++ b/mysql-test/suite/funcs_1/r/is_views.result @@ -37,7 +37,7 @@ IS_UPDATABLE varchar(3) NO NULL DEFINER varchar(384) NO NULL SECURITY_TYPE varchar(7) NO NULL CHARACTER_SET_CLIENT varchar(32) NO NULL -COLLATION_CONNECTION varchar(32) NO NULL +COLLATION_CONNECTION varchar(64) NO NULL ALGORITHM varchar(10) NO NULL SHOW CREATE TABLE information_schema.VIEWS; Table Create Table @@ -51,7 +51,7 @@ VIEWS CREATE TEMPORARY TABLE `VIEWS` ( `DEFINER` varchar(384) NOT NULL, `SECURITY_TYPE` varchar(7) NOT NULL, `CHARACTER_SET_CLIENT` varchar(32) NOT NULL, - `COLLATION_CONNECTION` varchar(32) NOT NULL, + `COLLATION_CONNECTION` varchar(64) NOT NULL, `ALGORITHM` varchar(10) NOT NULL ) DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SHOW COLUMNS FROM information_schema.VIEWS; @@ -65,7 +65,7 @@ IS_UPDATABLE varchar(3) NO NULL DEFINER varchar(384) NO NULL SECURITY_TYPE varchar(7) NO NULL CHARACTER_SET_CLIENT varchar(32) NO NULL -COLLATION_CONNECTION varchar(32) NO NULL +COLLATION_CONNECTION varchar(64) NO NULL ALGORITHM varchar(10) NO NULL SELECT table_catalog, table_schema, table_name FROM information_schema.views WHERE table_catalog <> 'def'; diff --git a/mysql-test/suite/funcs_1/r/is_views_embedded.result b/mysql-test/suite/funcs_1/r/is_views_embedded.result index 72fcead6bcd..136126d8ab5 100644 --- a/mysql-test/suite/funcs_1/r/is_views_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_views_embedded.result @@ -37,7 +37,7 @@ IS_UPDATABLE varchar(3) NO NULL DEFINER varchar(384) NO NULL SECURITY_TYPE varchar(7) NO NULL CHARACTER_SET_CLIENT varchar(32) NO NULL -COLLATION_CONNECTION varchar(32) NO NULL +COLLATION_CONNECTION varchar(64) NO NULL ALGORITHM varchar(10) NO NULL SHOW CREATE TABLE information_schema.VIEWS; Table Create Table @@ -51,7 +51,7 @@ VIEWS CREATE TEMPORARY TABLE `VIEWS` ( `DEFINER` varchar(384) NOT NULL, `SECURITY_TYPE` varchar(7) NOT NULL, `CHARACTER_SET_CLIENT` varchar(32) NOT NULL, - `COLLATION_CONNECTION` varchar(32) NOT NULL, + `COLLATION_CONNECTION` varchar(64) NOT NULL, `ALGORITHM` varchar(10) NOT NULL ) DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SHOW COLUMNS FROM information_schema.VIEWS; @@ -65,7 +65,7 @@ IS_UPDATABLE varchar(3) NO NULL DEFINER varchar(384) NO NULL SECURITY_TYPE varchar(7) NO NULL CHARACTER_SET_CLIENT varchar(32) NO NULL -COLLATION_CONNECTION varchar(32) NO NULL +COLLATION_CONNECTION varchar(64) NO NULL ALGORITHM varchar(10) NO NULL SELECT table_catalog, table_schema, table_name FROM information_schema.views WHERE table_catalog <> 'def'; diff --git a/mysql-test/suite/galera/r/galera_defaults.result b/mysql-test/suite/galera/r/galera_defaults.result index 04f45a7c770..84dd782999d 100644 --- a/mysql-test/suite/galera/r/galera_defaults.result +++ b/mysql-test/suite/galera/r/galera_defaults.result @@ -1,9 +1,6 @@ connection node_2; connection node_1; # Correct Galera library found -SELECT COUNT(*) `expect 50` FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep_%'; -expect 50 -50 SELECT VARIABLE_NAME, VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep_%' @@ -20,6 +17,7 @@ AND VARIABLE_NAME NOT IN ( ) ORDER BY VARIABLE_NAME; VARIABLE_NAME VARIABLE_VALUE +WSREP_ALLOWLIST WSREP_AUTO_INCREMENT_CONTROL ON WSREP_CAUSAL_READS ON WSREP_CERTIFICATION_RULES strict diff --git a/mysql-test/suite/galera/r/galera_gra_log.result b/mysql-test/suite/galera/r/galera_gra_log.result index 8ac76692262..4146192bb55 100644 --- a/mysql-test/suite/galera/r/galera_gra_log.result +++ b/mysql-test/suite/galera/r/galera_gra_log.result @@ -18,7 +18,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=<TIMESTAMP>/*!*/; SET @@session.pseudo_thread_id=<PSEUDO_THREAD_ID>/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/galera/r/galera_ist_MDEV-28423,debug.rdiff b/mysql-test/suite/galera/r/galera_ist_MDEV-28423,debug.rdiff index 96e5def88ff..4eda9d7d045 100644 --- a/mysql-test/suite/galera/r/galera_ist_MDEV-28423,debug.rdiff +++ b/mysql-test/suite/galera/r/galera_ist_MDEV-28423,debug.rdiff @@ -1,5 +1,5 @@ ---- r/galera_ist_MDEV-28423.result -+++ r/galera_ist_MDEV-28423.reject +--- suite/galera/r/galera_ist_MDEV-28423.result 2022-06-13 09:40:33.073863796 +0300 ++++ suite/galera/r/galera_ist_MDEV-28423.reject 2022-06-13 09:58:59.936874991 +0300 @@ -517,3 +517,187 @@ 1 DROP TABLE t1; diff --git a/mysql-test/suite/galera/r/galera_ist_MDEV-28583,debug.rdiff b/mysql-test/suite/galera/r/galera_ist_MDEV-28583,debug.rdiff index 9e6530aa9f7..1c33916330a 100644 --- a/mysql-test/suite/galera/r/galera_ist_MDEV-28583,debug.rdiff +++ b/mysql-test/suite/galera/r/galera_ist_MDEV-28583,debug.rdiff @@ -1,5 +1,5 @@ ---- r/galera_ist_MDEV-28583.result -+++ r/galera_ist_MDEV-28583.reject +--- suite/galera/r/galera_ist_MDEV-28583.result 2022-06-11 10:48:16.875034382 +0300 ++++ suite/galera/r/galera_ist_MDEV-28583,debug.reject 2022-06-11 11:25:55.616481509 +0300 @@ -517,3 +517,187 @@ 1 DROP TABLE t1; diff --git a/mysql-test/suite/galera/t/MW-329.test b/mysql-test/suite/galera/t/MW-329.test index 904fc2f95d8..16a65d9b7ae 100644 --- a/mysql-test/suite/galera/t/MW-329.test +++ b/mysql-test/suite/galera/t/MW-329.test @@ -89,7 +89,7 @@ while ($count) --enable_query_log --connection node_1b ---error 0,2013,1317 +--error 0,2013,1317,2026 --reap --enable_query_log --enable_result_log diff --git a/mysql-test/suite/galera/t/galera_bf_kill_debug.test b/mysql-test/suite/galera/t/galera_bf_kill_debug.test index c322f283757..6706734cc36 100644 --- a/mysql-test/suite/galera/t/galera_bf_kill_debug.test +++ b/mysql-test/suite/galera/t/galera_bf_kill_debug.test @@ -84,7 +84,7 @@ SET DEBUG_SYNC = "now SIGNAL continue_kill"; --reap --connection node_2a ---error 0,1213,2013 +--error 0,1213,2013,2026 select * from t1; --connection node_2 diff --git a/mysql-test/suite/galera/t/galera_defaults.test b/mysql-test/suite/galera/t/galera_defaults.test index 6b76473d6a6..ff08151327a 100644 --- a/mysql-test/suite/galera/t/galera_defaults.test +++ b/mysql-test/suite/galera/t/galera_defaults.test @@ -13,13 +13,11 @@ --source include/force_restart.inc # Make sure that the test is operating on the right version of galera library. ---let $galera_version=26.4.7 +--let $galera_version=26.4.11 source ../wsrep/include/check_galera_version.inc; # Global Variables -SELECT COUNT(*) `expect 50` FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep_%'; - SELECT VARIABLE_NAME, VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep_%' diff --git a/mysql-test/suite/galera/t/galera_var_reject_queries.test b/mysql-test/suite/galera/t/galera_var_reject_queries.test index 60aabe9bc17..fb86b69d95a 100644 --- a/mysql-test/suite/galera/t/galera_var_reject_queries.test +++ b/mysql-test/suite/galera/t/galera_var_reject_queries.test @@ -5,6 +5,10 @@ --source include/galera_cluster.inc --source include/have_innodb.inc +if (`select version() not like '10.10.3-%'`) { + skip disabled until new C/C; +} + CREATE TABLE t1 (f1 INTEGER NOT NULL PRIMARY KEY) engine=innodb; --connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1 @@ -26,7 +30,7 @@ SELECT * FROM t1; SET GLOBAL wsrep_reject_queries = ALL_KILL; --connection node_1a ---error ER_CONNECTION_KILLED,2013,2006 +--error ER_CONNECTION_KILLED,2013,2006,2026 SELECT * FROM t1; --connect node_1b, 127.0.0.1, root, , test, $NODE_MYPORT_1 diff --git a/mysql-test/suite/galera_3nodes/r/galera_allowlist.result b/mysql-test/suite/galera_3nodes/r/galera_allowlist.result new file mode 100644 index 00000000000..471444d8c08 --- /dev/null +++ b/mysql-test/suite/galera_3nodes/r/galera_allowlist.result @@ -0,0 +1,35 @@ +connection node_2; +connection node_1; +SELECT COUNT(*) = 3 FROM mysql.wsrep_allowlist; +COUNT(*) = 3 +1 +connection node_2; +SELECT COUNT(*) = 3 FROM mysql.wsrep_allowlist; +COUNT(*) = 3 +1 +connection node_3; +SET @@global.wsrep_desync = 1; +SET SESSION wsrep_sync_wait = 0; +SET GLOBAL wsrep_provider_options = 'gmcast.isolate=1'; +connection node_1; +DELETE FROM mysql.wsrep_allowlist WHERE ip LIKE '127.0.0.3'; +SELECT COUNT(*) = 2 FROM mysql.wsrep_allowlist; +COUNT(*) = 2 +1 +connection node_2; +SELECT COUNT(*) = 2 FROM mysql.wsrep_allowlist; +COUNT(*) = 2 +1 +connection node_3; +SET GLOBAL wsrep_provider_options = 'gmcast.isolate=0'; +SET @@global.wsrep_desync = 0; +connection node_1; +INSERT INTO mysql.wsrep_allowlist(ip) VALUES ('127.0.0.3'); +connection node_3; +# restart +connection node_1; +CALL mtr.add_suppression('WSREP: Connection not allowed'); +connection node_2; +CALL mtr.add_suppression('WSREP: Connection not allowed'); +connection node_3; +CALL mtr.add_suppression('WSREP: Ignoring lack of quorum'); diff --git a/mysql-test/suite/galera_3nodes/t/galera_allowlist.cnf b/mysql-test/suite/galera_3nodes/t/galera_allowlist.cnf new file mode 100644 index 00000000000..62f24c172af --- /dev/null +++ b/mysql-test/suite/galera_3nodes/t/galera_allowlist.cnf @@ -0,0 +1,26 @@ +!include ../galera_3nodes.cnf + +[mysqld] +wsrep_sst_method=rsync + +[mysqld.1] +wsrep_allowlist="127.0.0.1,127.0.0.2,127.0.0.3" + +[mysqld.2] +wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.2.#galera_port;gmcast.listen_addr=127.0.0.2;evs.suspect_timeout=PT10S;evs.inactive_timeout=PT30S;evs.install_timeout=PT15S' + +# Variable is only used on bootstrap node, so this will be ignored +wsrep_allowlist="127.0.0.1,127.0.0.2,127.0.0.3,127.0.0.4,127.0.0.5" + +wsrep_node_address=127.0.0.2 +wsrep_sst_receive_address=127.0.0.2:@mysqld.2.#sst_port +wsrep_node_incoming_address=127.0.0.2:@mysqld.2.port +wsrep_sst_receive_address='127.0.0.2:@mysqld.2.#sst_port' + +[mysqld.3] +wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.3.#galera_port;gmcast.listen_addr=127.0.0.3;evs.suspect_timeout=PT10S;evs.inactive_timeout=PT30S;evs.install_timeout=PT15S;pc.ignore_quorum=TRUE;pc.wait_prim=FALSE' + +wsrep_node_address=127.0.0.3 +wsrep_sst_receive_address=127.0.0.3:@mysqld.3.#sst_port +wsrep_node_incoming_address=127.0.0.3:@mysqld.3.port +wsrep_sst_receive_address='127.0.0.3:@mysqld.3.#sst_port'
\ No newline at end of file diff --git a/mysql-test/suite/galera_3nodes/t/galera_allowlist.test b/mysql-test/suite/galera_3nodes/t/galera_allowlist.test new file mode 100644 index 00000000000..74fff61c4f8 --- /dev/null +++ b/mysql-test/suite/galera_3nodes/t/galera_allowlist.test @@ -0,0 +1,66 @@ +--source include/galera_cluster.inc +--source include/have_innodb.inc + +# Check that `wsrep_allowlist` variable is loaded +SELECT COUNT(*) = 3 FROM mysql.wsrep_allowlist; + +--connection node_2 +# Check that non-bootstrap nodes doesn't populate `mysql.wsrep_allowlist` +SELECT COUNT(*) = 3 FROM mysql.wsrep_allowlist; + +--let $galera_connection_name = node_3 +--let $galera_server_number = 3 +--source include/galera_connect.inc + +--connection node_3 +# Desync and disconnect node 3 from the PC: +SET @@global.wsrep_desync = 1; +SET SESSION wsrep_sync_wait = 0; +SET GLOBAL wsrep_provider_options = 'gmcast.isolate=1'; + +--connection node_1 +# Wait until node 3 disappears from the PC: +--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; +--source include/wait_condition.inc + +# Delete node ip (127.0.0.3) from allowlist +DELETE FROM mysql.wsrep_allowlist WHERE ip LIKE '127.0.0.3'; + +SELECT COUNT(*) = 2 FROM mysql.wsrep_allowlist; + +--connection node_2 +SELECT COUNT(*) = 2 FROM mysql.wsrep_allowlist; + +--connection node_3 +# Reconnect node 2 to the PC: +SET GLOBAL wsrep_provider_options = 'gmcast.isolate=0'; + +# We should reach Primary with cluster size = 1 because of `pc.ignore_quorum=TRUE and pc.wait_prim=FALSE` used in configuration +--let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; +--source include/wait_condition.inc + +# Resync should pass: +SET @@global.wsrep_desync = 0; + +# Shutdown node +--source include/shutdown_mysqld.inc + +--connection node_1 +# Allow node 3 could be reconnected to cluster +INSERT INTO mysql.wsrep_allowlist(ip) VALUES ('127.0.0.3'); + +--connection node_3 +--source include/start_mysqld.inc +--source include/wait_until_connected_again.inc + +--connection node_1 +--let $wait_condition = SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; +--source include/wait_condition.inc + +CALL mtr.add_suppression('WSREP: Connection not allowed'); + +--connection node_2 +CALL mtr.add_suppression('WSREP: Connection not allowed'); + +--connection node_3 +CALL mtr.add_suppression('WSREP: Ignoring lack of quorum'); diff --git a/mysql-test/suite/galera_sr/t/galera_sr_cc_master.test b/mysql-test/suite/galera_sr/t/galera_sr_cc_master.test index da547c59626..6665a6e728d 100644 --- a/mysql-test/suite/galera_sr/t/galera_sr_cc_master.test +++ b/mysql-test/suite/galera_sr/t/galera_sr_cc_master.test @@ -1,6 +1,10 @@ --source include/galera_cluster.inc --source include/have_innodb.inc +if (`select version() not like '10.10.3-%'`) { + skip disabled until new C/C; +} + # # Test the effect of Cluster Configuration Change on a concurrently-running SR transaction # We use SET GLOBAL wsrep_cluster_address = '' to cause the master (node_2) to temporarily diff --git a/mysql-test/suite/gcol/inc/gcol_blocked_sql_funcs_main.inc b/mysql-test/suite/gcol/inc/gcol_blocked_sql_funcs_main.inc index 879e2fe857d..4cc107306ba 100644 --- a/mysql-test/suite/gcol/inc/gcol_blocked_sql_funcs_main.inc +++ b/mysql-test/suite/gcol/inc/gcol_blocked_sql_funcs_main.inc @@ -251,3 +251,18 @@ drop table t1; --echo # --echo # End of 10.3 tests --echo # + +--echo # +--echo # MDEV-29029 Index corruption and/or assertion failure upon using RANDOM_BYTES for indexed virtual column +--echo # + +create table t1 (a int); +--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED +alter table t1 add column b binary(32) generated always as (random_bytes(a)); +alter table t1 add column b binary(32) default (random_bytes(a)); +drop table t1; + +--echo # +--echo # +--echo # End of 10.10 tests +--echo # diff --git a/mysql-test/suite/gcol/r/gcol_blocked_sql_funcs_innodb.result b/mysql-test/suite/gcol/r/gcol_blocked_sql_funcs_innodb.result index 6b7faa18da8..a79ed43c7f3 100644 --- a/mysql-test/suite/gcol/r/gcol_blocked_sql_funcs_innodb.result +++ b/mysql-test/suite/gcol/r/gcol_blocked_sql_funcs_innodb.result @@ -173,6 +173,18 @@ drop table t1; # # End of 10.3 tests # +# +# MDEV-29029 Index corruption and/or assertion failure upon using RANDOM_BYTES for indexed virtual column +# +create table t1 (a int); +alter table t1 add column b binary(32) generated always as (random_bytes(a)); +ERROR HY000: Function or expression 'random_bytes()' cannot be used in the GENERATED ALWAYS AS clause of `b` +alter table t1 add column b binary(32) default (random_bytes(a)); +drop table t1; +# +# +# End of 10.10 tests +# DROP VIEW IF EXISTS v1,v2; DROP TABLE IF EXISTS t1,t2,t3; DROP PROCEDURE IF EXISTS p1; diff --git a/mysql-test/suite/gcol/r/gcol_blocked_sql_funcs_myisam.result b/mysql-test/suite/gcol/r/gcol_blocked_sql_funcs_myisam.result index 99921c658b3..ac8bd0a3322 100644 --- a/mysql-test/suite/gcol/r/gcol_blocked_sql_funcs_myisam.result +++ b/mysql-test/suite/gcol/r/gcol_blocked_sql_funcs_myisam.result @@ -175,6 +175,18 @@ drop table t1; # # End of 10.3 tests # +# +# MDEV-29029 Index corruption and/or assertion failure upon using RANDOM_BYTES for indexed virtual column +# +create table t1 (a int); +alter table t1 add column b binary(32) generated always as (random_bytes(a)); +ERROR HY000: Function or expression 'random_bytes()' cannot be used in the GENERATED ALWAYS AS clause of `b` +alter table t1 add column b binary(32) default (random_bytes(a)); +drop table t1; +# +# +# End of 10.10 tests +# DROP VIEW IF EXISTS v1,v2; DROP TABLE IF EXISTS t1,t2,t3; DROP PROCEDURE IF EXISTS p1; diff --git a/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_innodb.result b/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_innodb.result index 9929f4d1eaa..1b12e0a9bc6 100644 --- a/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_innodb.result +++ b/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_innodb.result @@ -2599,7 +2599,7 @@ create table t1 (a timestamp, c bigint generated always as (timestampdiff(MONTH, show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `a` timestamp NULL DEFAULT NULL, `c` bigint(20) GENERATED ALWAYS AS (timestampdiff(MONTH,`a`,`a`)) VIRTUAL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values ('2003-02-01',default); diff --git a/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_myisam.result b/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_myisam.result index 802e830a587..8553f87dc58 100644 --- a/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_myisam.result +++ b/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_myisam.result @@ -2599,7 +2599,7 @@ create table t1 (a timestamp, c bigint generated always as (timestampdiff(MONTH, show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `a` timestamp NULL DEFAULT NULL, `c` bigint(20) GENERATED ALWAYS AS (timestampdiff(MONTH,`a`,`a`)) VIRTUAL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values ('2003-02-01',default); diff --git a/mysql-test/suite/gcol/r/innodb_virtual_fk.result b/mysql-test/suite/gcol/r/innodb_virtual_fk.result index faba10161fb..97058bc2c52 100644 --- a/mysql-test/suite/gcol/r/innodb_virtual_fk.result +++ b/mysql-test/suite/gcol/r/innodb_virtual_fk.result @@ -712,7 +712,7 @@ SET foreign_key_checks=1; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NULL DEFAULT NULL, `c2` year(4) DEFAULT NULL, `c3` time DEFAULT NULL, `c4` char(10) DEFAULT NULL, @@ -729,7 +729,7 @@ ERROR HY000: Can't create table `test`.`t1` (errno: 150 "Foreign key constraint SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NULL DEFAULT NULL, `c2` year(4) DEFAULT NULL, `c3` time DEFAULT NULL, `c4` char(10) DEFAULT NULL, diff --git a/mysql-test/suite/innodb/r/innodb-alter-timestamp.result b/mysql-test/suite/innodb/r/innodb-alter-timestamp.result index 1609812ed30..1a68c54095a 100644 --- a/mysql-test/suite/innodb/r/innodb-alter-timestamp.result +++ b/mysql-test/suite/innodb/r/innodb-alter-timestamp.result @@ -59,16 +59,11 @@ SELECT DISTINCT d1 FROM t1; d1 NULL ALTER TABLE t1 CHANGE d1 d1 TIMESTAMP DEFAULT '2017-05-08 16:32:54'; -affected rows: 5 -info: Records: 5 Duplicates: 0 Warnings: 0 -# Note: NULL was changed to CURRENT_TIMESTAMP(), -# not the specified constant DEFAULT value! +affected rows: 0 +info: Records: 0 Duplicates: 0 Warnings: 0 SELECT COUNT(DISTINCT d1),COUNT(d1),COUNT(*) FROM t1; COUNT(DISTINCT d1) COUNT(d1) COUNT(*) -1 5 5 -SELECT DISTINCT (CURRENT_TIMESTAMP()-d1) <= 60 FROM t1; -(CURRENT_TIMESTAMP()-d1) <= 60 -1 +0 0 5 drop table t1; CREATE TABLE t1 ( `i1` INT(10) UNSIGNED NOT NULL, @@ -111,8 +106,8 @@ t1 CREATE TABLE `t1` ( `i1` int(10) unsigned NOT NULL, `d1` timestamp NOT NULL DEFAULT current_timestamp(), `u1` varchar(30) DEFAULT substr(user(),1), - `d2` timestamp NOT NULL DEFAULT '2017-05-08 16:23:45', - `d3` timestamp NOT NULL DEFAULT `d1` + `d2` timestamp NULL DEFAULT '2017-05-08 16:23:45', + `d3` timestamp NULL DEFAULT `d1` ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ADD COLUMN d4 TIMESTAMP DEFAULT CURRENT_TIMESTAMP; affected rows: 0 diff --git a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result index 47e5f0f5c94..742a822baa0 100644 --- a/mysql-test/suite/innodb/r/innodb.result +++ b/mysql-test/suite/innodb/r/innodb.result @@ -1694,15 +1694,6 @@ OK SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size'; variable_value 16384 -SELECT variable_value - @innodb_rows_deleted_orig FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_rows_deleted'; -variable_value - @innodb_rows_deleted_orig -71 -SELECT variable_value - @innodb_rows_inserted_orig FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_rows_inserted'; -variable_value - @innodb_rows_inserted_orig -964 -SELECT variable_value - @innodb_rows_updated_orig FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_rows_updated'; -variable_value - @innodb_rows_updated_orig -865 SELECT variable_value - @innodb_row_lock_waits_orig FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_row_lock_waits'; variable_value - @innodb_row_lock_waits_orig 0 diff --git a/mysql-test/suite/innodb/r/innodb_ctype_ldml.result b/mysql-test/suite/innodb/r/innodb_ctype_ldml.result index 82679961d68..22841cca760 100644 --- a/mysql-test/suite/innodb/r/innodb_ctype_ldml.result +++ b/mysql-test/suite/innodb/r/innodb_ctype_ldml.result @@ -402,6 +402,7 @@ utf8mb4_test_ci utf8mb4 326 8 utf16_test_ci utf16 327 8 utf8mb4_test_400_ci utf8mb4 328 8 utf8mb4_test_520_nopad_ci utf8mb4 329 8 +utf8mb4_uca1400_test01_as_ci utf8mb4 330 4 latin1_test latin1 331 1 latin1_test2 latin1 332 1 latin1_test2_cs latin1 333 1 @@ -438,6 +439,7 @@ ucs2_test_ci ucs2 358 8 utf8mb4_test_ci utf8mb4 326 8 utf8mb4_test_400_ci utf8mb4 328 8 utf8mb4_test_520_nopad_ci utf8mb4 329 8 +utf8mb4_uca1400_test01_as_ci utf8mb4 330 4 utf16_test_ci utf16 327 8 utf32_test_ci utf32 391 8 show collation like 'ucs2_vn_ci'; diff --git a/mysql-test/suite/innodb/r/innodb_skip_innodb_is_tables.result b/mysql-test/suite/innodb/r/innodb_skip_innodb_is_tables.result index dd253311ddd..e919f0dee0b 100644 --- a/mysql-test/suite/innodb/r/innodb_skip_innodb_is_tables.result +++ b/mysql-test/suite/innodb/r/innodb_skip_innodb_is_tables.result @@ -70,8 +70,6 @@ buffer_pool_pages_free buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL N buffer_pages_created buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Number of pages created (innodb_pages_created) buffer_pages_written buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Number of pages written (innodb_pages_written) buffer_pages_read buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Number of pages read (innodb_pages_read) -buffer_index_sec_rec_cluster_reads buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Number of secondary record reads triggered cluster read -buffer_index_sec_rec_cluster_reads_avoided buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Number of secondary record reads avoided triggering cluster read buffer_data_reads buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Amount of data read in bytes (innodb_data_reads) buffer_data_written buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Amount of data written in bytes (innodb_data_written) buffer_flush_batch_scanned buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 set_owner Total pages scanned as part of flush batch @@ -226,14 +224,6 @@ innodb_dict_lru_count_idle server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NU innodb_dblwr_writes server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Number of doublewrite operations that have been performed (innodb_dblwr_writes) innodb_dblwr_pages_written server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Number of pages that have been written for doublewrite operations (innodb_dblwr_pages_written) innodb_page_size server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 value InnoDB page size in bytes (innodb_page_size) -dml_reads dml 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Number of rows read -dml_inserts dml 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Number of rows inserted -dml_deletes dml 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Number of rows deleted -dml_updates dml 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Number of rows updated -dml_system_reads dml 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Number of system rows read -dml_system_inserts dml 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Number of system rows inserted -dml_system_deletes dml 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Number of system rows deleted -dml_system_updates dml 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 status_counter Number of system rows updated ddl_background_drop_indexes ddl 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of indexes waiting to be dropped after failed index creation ddl_online_create_index ddl 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of indexes being created online ddl_pending_alter_table ddl 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of ALTER TABLE, CREATE INDEX, DROP INDEX in progress diff --git a/mysql-test/suite/innodb/r/innodb_status_variables.result b/mysql-test/suite/innodb/r/innodb_status_variables.result index dd3d3ca1dd2..3a86271c226 100644 --- a/mysql-test/suite/innodb/r/innodb_status_variables.result +++ b/mysql-test/suite/innodb/r/innodb_status_variables.result @@ -75,14 +75,6 @@ INNODB_ROW_LOCK_TIME INNODB_ROW_LOCK_TIME_AVG INNODB_ROW_LOCK_TIME_MAX INNODB_ROW_LOCK_WAITS -INNODB_ROWS_DELETED -INNODB_ROWS_INSERTED -INNODB_ROWS_READ -INNODB_ROWS_UPDATED -INNODB_SYSTEM_ROWS_DELETED -INNODB_SYSTEM_ROWS_INSERTED -INNODB_SYSTEM_ROWS_READ -INNODB_SYSTEM_ROWS_UPDATED INNODB_NUM_OPEN_FILES INNODB_TRUNCATED_STATUS_WRITES INNODB_AVAILABLE_UNDO_LOGS @@ -107,8 +99,6 @@ INNODB_INSTANT_ALTER_COLUMN INNODB_ONLINEDDL_ROWLOG_ROWS INNODB_ONLINEDDL_ROWLOG_PCT_USED INNODB_ONLINEDDL_PCT_PROGRESS -INNODB_SECONDARY_INDEX_TRIGGERED_CLUSTER_READS -INNODB_SECONDARY_INDEX_TRIGGERED_CLUSTER_READS_AVOIDED INNODB_ENCRYPTION_ROTATION_PAGES_READ_FROM_CACHE INNODB_ENCRYPTION_ROTATION_PAGES_READ_FROM_DISK INNODB_ENCRYPTION_ROTATION_PAGES_MODIFIED diff --git a/mysql-test/suite/innodb/r/instant_alter_debug.result b/mysql-test/suite/innodb/r/instant_alter_debug.result index 5f74c234260..7205fc48b50 100644 --- a/mysql-test/suite/innodb/r/instant_alter_debug.result +++ b/mysql-test/suite/innodb/r/instant_alter_debug.result @@ -78,9 +78,7 @@ c7 VARCHAR(257) CHARACTER SET latin1, c8 VARCHAR(257) CHARACTER SET binary ) ENGINE=InnoDB; INSERT INTO t9 () VALUES (); -ALTER TABLE t9 ADD COLUMN IF NOT EXISTS t TIMESTAMP NULL KEY; -Warnings: -Note 1061 Multiple primary key defined +ALTER TABLE t9 ADD COLUMN IF NOT EXISTS t TIMESTAMP NULL; SET DEBUG_SYNC='row_log_table_apply1_before SIGNAL rebuilt WAIT_FOR dml'; OPTIMIZE TABLE t9; connection dml; diff --git a/mysql-test/suite/innodb/r/monitor.result b/mysql-test/suite/innodb/r/monitor.result index 221c92faaea..63f78752276 100644 --- a/mysql-test/suite/innodb/r/monitor.result +++ b/mysql-test/suite/innodb/r/monitor.result @@ -36,8 +36,6 @@ buffer_pool_pages_free disabled buffer_pages_created disabled buffer_pages_written disabled buffer_pages_read disabled -buffer_index_sec_rec_cluster_reads disabled -buffer_index_sec_rec_cluster_reads_avoided disabled buffer_data_reads disabled buffer_data_written disabled buffer_flush_batch_scanned disabled @@ -192,14 +190,6 @@ innodb_dict_lru_count_idle disabled innodb_dblwr_writes disabled innodb_dblwr_pages_written disabled innodb_page_size disabled -dml_reads disabled -dml_inserts disabled -dml_deletes disabled -dml_updates disabled -dml_system_reads disabled -dml_system_inserts disabled -dml_system_deletes disabled -dml_system_updates disabled ddl_background_drop_indexes disabled ddl_online_create_index disabled ddl_pending_alter_table disabled @@ -391,134 +381,6 @@ where name='trx_rollbacks'; name max_count min_count count max_count_reset min_count_reset count_reset status trx_rollbacks 1 NULL 1 1 NULL 1 enabled set global innodb_monitor_disable = module_trx; -set global innodb_monitor_enable = module_dml; -insert into monitor_test values(9); -update monitor_test set col = 10 where col = 9; -select name, max_count, min_count, count, -max_count_reset, min_count_reset, count_reset, -if(enabled,'enabled','disabled') status -from information_schema.innodb_metrics -where name like "dml%"; -name max_count min_count count max_count_reset min_count_reset count_reset status -dml_reads 2 NULL 2 2 NULL 2 enabled -dml_inserts 1 NULL 1 1 NULL 1 enabled -dml_deletes 0 NULL 0 0 NULL 0 enabled -dml_updates 2 NULL 2 2 NULL 2 enabled -dml_system_reads 0 NULL 0 0 NULL 0 enabled -dml_system_inserts 0 NULL 0 0 NULL 0 enabled -dml_system_deletes 0 NULL 0 0 NULL 0 enabled -dml_system_updates 0 NULL 0 0 NULL 0 enabled -delete from monitor_test; -select name, max_count, min_count, count, -max_count_reset, min_count_reset, count_reset, -if(enabled,'enabled','disabled') status -from information_schema.innodb_metrics -where name like "dml%"; -name max_count min_count count max_count_reset min_count_reset count_reset status -dml_reads 4 NULL 4 4 NULL 4 enabled -dml_inserts 1 NULL 1 1 NULL 1 enabled -dml_deletes 2 NULL 2 2 NULL 2 enabled -dml_updates 2 NULL 2 2 NULL 2 enabled -dml_system_reads 0 NULL 0 0 NULL 0 enabled -dml_system_inserts 0 NULL 0 0 NULL 0 enabled -dml_system_deletes 0 NULL 0 0 NULL 0 enabled -dml_system_updates 0 NULL 0 0 NULL 0 enabled -set global innodb_monitor_reset = module_dml; -select name, max_count, min_count, count, -max_count_reset, min_count_reset, count_reset, -if(enabled,'enabled','disabled') status -from information_schema.innodb_metrics -where name like "dml%"; -name max_count min_count count max_count_reset min_count_reset count_reset status -dml_reads 4 NULL 4 0 NULL 0 enabled -dml_inserts 1 NULL 1 0 NULL 0 enabled -dml_deletes 2 NULL 2 0 NULL 0 enabled -dml_updates 2 NULL 2 0 NULL 0 enabled -dml_system_reads 0 NULL 0 0 NULL 0 enabled -dml_system_inserts 0 NULL 0 0 NULL 0 enabled -dml_system_deletes 0 NULL 0 0 NULL 0 enabled -dml_system_updates 0 NULL 0 0 NULL 0 enabled -insert into monitor_test values(9); -insert into monitor_test values(1); -delete from monitor_test; -select name, max_count, min_count, count, -max_count_reset, min_count_reset, count_reset, -if(enabled,'enabled','disabled') status -from information_schema.innodb_metrics -where name like "dml%"; -name max_count min_count count max_count_reset min_count_reset count_reset status -dml_reads 6 NULL 6 2 NULL 2 enabled -dml_inserts 3 NULL 3 2 NULL 2 enabled -dml_deletes 4 NULL 4 2 NULL 2 enabled -dml_updates 2 NULL 2 0 NULL 0 enabled -dml_system_reads 0 NULL 0 0 NULL 0 enabled -dml_system_inserts 0 NULL 0 0 NULL 0 enabled -dml_system_deletes 0 NULL 0 0 NULL 0 enabled -dml_system_updates 0 NULL 0 0 NULL 0 enabled -set global innodb_monitor_reset_all = module_dml; -select name, max_count, min_count, count, -max_count_reset, min_count_reset, count_reset, -if(enabled,'enabled','disabled') status -from information_schema.innodb_metrics -where name like "dml%"; -name max_count min_count count max_count_reset min_count_reset count_reset status -dml_reads 6 NULL 6 2 NULL 2 enabled -dml_inserts 3 NULL 3 2 NULL 2 enabled -dml_deletes 4 NULL 4 2 NULL 2 enabled -dml_updates 2 NULL 2 0 NULL 0 enabled -dml_system_reads 0 NULL 0 0 NULL 0 enabled -dml_system_inserts 0 NULL 0 0 NULL 0 enabled -dml_system_deletes 0 NULL 0 0 NULL 0 enabled -dml_system_updates 0 NULL 0 0 NULL 0 enabled -set global innodb_monitor_disable = module_dml; -select name, max_count, min_count, count, -max_count_reset, min_count_reset, count_reset, -if(enabled,'enabled','disabled') status -from information_schema.innodb_metrics -where name like "dml%"; -name max_count min_count count max_count_reset min_count_reset count_reset status -dml_reads 6 NULL 6 2 NULL 2 disabled -dml_inserts 3 NULL 3 2 NULL 2 disabled -dml_deletes 4 NULL 4 2 NULL 2 disabled -dml_updates 2 NULL 2 0 NULL 0 disabled -dml_system_reads 0 NULL 0 0 NULL 0 disabled -dml_system_inserts 0 NULL 0 0 NULL 0 disabled -dml_system_deletes 0 NULL 0 0 NULL 0 disabled -dml_system_updates 0 NULL 0 0 NULL 0 disabled -set global innodb_monitor_reset_all = module_dml; -select name, max_count, min_count, count, -max_count_reset, min_count_reset, count_reset, -if(enabled,'enabled','disabled') status -from information_schema.innodb_metrics -where name like "dml%"; -name max_count min_count count max_count_reset min_count_reset count_reset status -dml_reads NULL NULL 0 NULL NULL 0 disabled -dml_inserts NULL NULL 0 NULL NULL 0 disabled -dml_deletes NULL NULL 0 NULL NULL 0 disabled -dml_updates NULL NULL 0 NULL NULL 0 disabled -dml_system_reads NULL NULL 0 NULL NULL 0 disabled -dml_system_inserts NULL NULL 0 NULL NULL 0 disabled -dml_system_deletes NULL NULL 0 NULL NULL 0 disabled -dml_system_updates NULL NULL 0 NULL NULL 0 disabled -set global innodb_monitor_enable = dml_inserts; -insert into monitor_test values(9); -insert into monitor_test values(1); -delete from monitor_test; -select name, max_count, min_count, count, -max_count_reset, min_count_reset, count_reset, -if(enabled,'enabled','disabled') status -from information_schema.innodb_metrics -where name like "dml%"; -name max_count min_count count max_count_reset min_count_reset count_reset status -dml_reads NULL NULL 0 NULL NULL 0 disabled -dml_inserts 2 NULL 2 2 NULL 2 enabled -dml_deletes NULL NULL 0 NULL NULL 0 disabled -dml_updates NULL NULL 0 NULL NULL 0 disabled -dml_system_reads NULL NULL 0 NULL NULL 0 disabled -dml_system_inserts NULL NULL 0 NULL NULL 0 disabled -dml_system_deletes NULL NULL 0 NULL NULL 0 disabled -dml_system_updates NULL NULL 0 NULL NULL 0 disabled -set global innodb_monitor_disable = module_dml; drop table monitor_test; set global innodb_monitor_enable = file_num_open_files; select name, max_count, min_count, count, diff --git a/mysql-test/suite/innodb/r/purge_thread_shutdown.result b/mysql-test/suite/innodb/r/purge_thread_shutdown.result index 85ac77e6d49..747fe91c966 100644 --- a/mysql-test/suite/innodb/r/purge_thread_shutdown.result +++ b/mysql-test/suite/innodb/r/purge_thread_shutdown.result @@ -22,6 +22,6 @@ delete from t1 where a=3; set global innodb_fast_shutdown=0; ERROR 42000: Variable 'innodb_fast_shutdown' can't be set to the value of '0' kill ID; -ERROR 70100: Connection was killed +Got one of the listed errors # restart drop table t1; diff --git a/mysql-test/suite/innodb/t/innodb-alter-timestamp.test b/mysql-test/suite/innodb/t/innodb-alter-timestamp.test index e1c263dc5d0..95df8d6b649 100644 --- a/mysql-test/suite/innodb/t/innodb-alter-timestamp.test +++ b/mysql-test/suite/innodb/t/innodb-alter-timestamp.test @@ -48,10 +48,7 @@ SELECT DISTINCT d1 FROM t1; --enable_info ALTER TABLE t1 CHANGE d1 d1 TIMESTAMP DEFAULT '2017-05-08 16:32:54'; --disable_info ---echo # Note: NULL was changed to CURRENT_TIMESTAMP(), ---echo # not the specified constant DEFAULT value! SELECT COUNT(DISTINCT d1),COUNT(d1),COUNT(*) FROM t1; -SELECT DISTINCT (CURRENT_TIMESTAMP()-d1) <= 60 FROM t1; drop table t1; CREATE TABLE t1 ( diff --git a/mysql-test/suite/innodb/t/innodb.test b/mysql-test/suite/innodb/t/innodb.test index 3b3b2770df7..58e9899bd40 100644 --- a/mysql-test/suite/innodb/t/innodb.test +++ b/mysql-test/suite/innodb/t/innodb.test @@ -25,9 +25,6 @@ call mtr.add_suppression("\\[ERROR\\] InnoDB: in ALTER TABLE `test`.`t1`"); call mtr.add_suppression("\\[ERROR\\] InnoDB: in RENAME TABLE table `test`.`t1`"); --disable_warnings -SET @innodb_rows_deleted_orig = (SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_rows_deleted'); -SET @innodb_rows_inserted_orig = (SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_rows_inserted'); -SET @innodb_rows_updated_orig = (SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_rows_updated'); SET @innodb_row_lock_waits_orig = (SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_row_lock_waits'); SET @innodb_row_lock_current_waits_orig = (SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_row_lock_current_waits'); SET @innodb_row_lock_time_orig = (SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_row_lock_time'); @@ -1319,9 +1316,6 @@ drop table t1; # uses previous ones(pages_created, rows_deleted, ...). SELECT IF(variable_value BETWEEN 488 AND 512, 'OK', variable_value) FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total'; SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size'; -SELECT variable_value - @innodb_rows_deleted_orig FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_rows_deleted'; -SELECT variable_value - @innodb_rows_inserted_orig FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_rows_inserted'; -SELECT variable_value - @innodb_rows_updated_orig FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_rows_updated'; # Test for row locks InnoDB status variables. SELECT variable_value - @innodb_row_lock_waits_orig FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_row_lock_waits'; diff --git a/mysql-test/suite/innodb/t/innodb_bug51920.test b/mysql-test/suite/innodb/t/innodb_bug51920.test index 0a9839b612a..84977925548 100644 --- a/mysql-test/suite/innodb/t/innodb_bug51920.test +++ b/mysql-test/suite/innodb/t/innodb_bug51920.test @@ -38,7 +38,7 @@ let $wait_condition = # depending on platform. # connection con1; --- error 1317, 2006, 2013, ER_CONNECTION_KILLED +-- error 1317, 2006, 2013, ER_CONNECTION_KILLED, 2026 reap; connection default; DROP TABLE bug51920; diff --git a/mysql-test/suite/innodb/t/instant_alter_debug.test b/mysql-test/suite/innodb/t/instant_alter_debug.test index c6eca884907..64f94a78f2e 100644 --- a/mysql-test/suite/innodb/t/instant_alter_debug.test +++ b/mysql-test/suite/innodb/t/instant_alter_debug.test @@ -91,7 +91,7 @@ CREATE TABLE t9 ( c8 VARCHAR(257) CHARACTER SET binary ) ENGINE=InnoDB; INSERT INTO t9 () VALUES (); -ALTER TABLE t9 ADD COLUMN IF NOT EXISTS t TIMESTAMP NULL KEY; +ALTER TABLE t9 ADD COLUMN IF NOT EXISTS t TIMESTAMP NULL; SET DEBUG_SYNC='row_log_table_apply1_before SIGNAL rebuilt WAIT_FOR dml'; --send OPTIMIZE TABLE t9; diff --git a/mysql-test/suite/innodb/t/monitor.test b/mysql-test/suite/innodb/t/monitor.test index d6fa3f2fbc9..9b093d41892 100644 --- a/mysql-test/suite/innodb/t/monitor.test +++ b/mysql-test/suite/innodb/t/monitor.test @@ -254,93 +254,6 @@ where name='trx_rollbacks'; set global innodb_monitor_disable = module_trx; -# Test DML Module -set global innodb_monitor_enable = module_dml; - -insert into monitor_test values(9); - -update monitor_test set col = 10 where col = 9; - -select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, - if(enabled,'enabled','disabled') status -from information_schema.innodb_metrics -where name like "dml%"; - -delete from monitor_test; - -select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, - if(enabled,'enabled','disabled') status - from information_schema.innodb_metrics - where name like "dml%"; - -# test reset counter while the counter is on -set global innodb_monitor_reset = module_dml; - -select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, - if(enabled,'enabled','disabled') status -from information_schema.innodb_metrics -where name like "dml%"; - -# insert/delete some rows after the reset -insert into monitor_test values(9); -insert into monitor_test values(1); - -delete from monitor_test; - -select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, - if(enabled,'enabled','disabled') status -from information_schema.innodb_metrics -where name like "dml%"; - -# We do not allow reset_all while the counter is on, nothing -# should be reset here -set global innodb_monitor_reset_all = module_dml; - -select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, - if(enabled,'enabled','disabled') status -from information_schema.innodb_metrics -where name like "dml%"; - -# Turn off the counter -set global innodb_monitor_disable = module_dml; - -select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, - if(enabled,'enabled','disabled') status -from information_schema.innodb_metrics -where name like "dml%"; - -# Reset all counter values -set global innodb_monitor_reset_all = module_dml; - -select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, - if(enabled,'enabled','disabled') status -from information_schema.innodb_metrics -where name like "dml%"; - -# Open individual counter "dml_inserts" -set global innodb_monitor_enable = dml_inserts; - -insert into monitor_test values(9); -insert into monitor_test values(1); - -delete from monitor_test; - -# Only counter "dml_inserts" should be updated -select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, - if(enabled,'enabled','disabled') status -from information_schema.innodb_metrics -where name like "dml%"; - -set global innodb_monitor_disable = module_dml; - drop table monitor_test; set global innodb_monitor_enable = file_num_open_files; diff --git a/mysql-test/suite/innodb/t/purge_thread_shutdown.test b/mysql-test/suite/innodb/t/purge_thread_shutdown.test index 5be29b7a6a3..447f1fd3804 100644 --- a/mysql-test/suite/innodb/t/purge_thread_shutdown.test +++ b/mysql-test/suite/innodb/t/purge_thread_shutdown.test @@ -36,7 +36,7 @@ set global innodb_fast_shutdown=0; # the error code let $me=`select concat(' ', connection_id())`; replace_result $me ID; -error ER_CONNECTION_KILLED; +error ER_CONNECTION_KILLED, 2026; eval kill $me; source include/start_mysqld.inc; diff --git a/mysql-test/suite/innodb/t/temporary_table.test b/mysql-test/suite/innodb/t/temporary_table.test index 5d7e5d51696..6b2cd6b9b2c 100644 --- a/mysql-test/suite/innodb/t/temporary_table.test +++ b/mysql-test/suite/innodb/t/temporary_table.test @@ -143,7 +143,7 @@ let $counter= 5000; let $mysql_errno= 9999; while ($mysql_errno) { - --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,2002,2006,2013 + --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,2002,2006,2013,2026 select 1; dec $counter; diff --git a/mysql-test/suite/mariabackup/slave_info_norpl.result b/mysql-test/suite/mariabackup/slave_info_norpl.result index 9fcd67a8916..04ca2fb2242 100644 --- a/mysql-test/suite/mariabackup/slave_info_norpl.result +++ b/mysql-test/suite/mariabackup/slave_info_norpl.result @@ -31,28 +31,30 @@ CHANGE MASTER 'master4' TO MASTER_HOST='localhost', MASTER_PORT=10004, MASTER_US CHANGE MASTER 'master5' TO MASTER_HOST='localhost', MASTER_PORT=10005, MASTER_USE_GTID=slave_pos; lineno line 1 SET GLOBAL gtid_slave_pos = '<NUM-NUM-NUM>,<NUM-NUM-NUM>'; -2 CHANGE MASTER TO MASTER_LOG_FILE='', MASTER_LOG_POS=<NUM>; -3 CHANGE MASTER 'master2' TO MASTER_LOG_FILE='', MASTER_LOG_POS=<NUM>; +2 CHANGE MASTER TO master_use_gtid = slave_pos; +3 CHANGE MASTER 'master2' TO master_use_gtid = slave_pos; 4 CHANGE MASTER 'master3' TO master_use_gtid = slave_pos; 5 CHANGE MASTER 'master4' TO MASTER_LOG_FILE='', MASTER_LOG_POS=<NUM>; 6 CHANGE MASTER 'master5' TO master_use_gtid = slave_pos; line -[00] YYYY-MM-DD hh:mm:ss MySQL slave binlog position: gtid_slave_pos '<NUM-NUM-NUM>,<NUM-NUM-NUM>'; master '' filename '' position '0'; master 'master2' filename '' position '0'; master 'master3' master_use_gtid = slave_pos; master 'master4' filename '' position '0'; master 'master5' master_use_gtid = slave_pos +[00] YYYY-MM-DD hh:mm:ss MySQL slave binlog position: gtid_slave_pos '<NUM-NUM-NUM>,<NUM-NUM-NUM>'; master '' master_use_gtid = slave_pos; master 'master2' master_use_gtid = slave_pos; master 'master3' master_use_gtid = slave_pos; master 'master4' filename '' position '0'; master 'master5' master_use_gtid = slave_pos CHANGE MASTER TO MASTER_HOST='localhost', MASTER_PORT=10000, MASTER_USE_GTID=slave_pos; lineno line 1 SET GLOBAL gtid_slave_pos = '<NUM-NUM-NUM>,<NUM-NUM-NUM>'; 2 CHANGE MASTER TO master_use_gtid = slave_pos; -3 CHANGE MASTER 'master2' TO MASTER_LOG_FILE='', MASTER_LOG_POS=<NUM>; +3 CHANGE MASTER 'master2' TO master_use_gtid = slave_pos; 4 CHANGE MASTER 'master3' TO master_use_gtid = slave_pos; 5 CHANGE MASTER 'master4' TO MASTER_LOG_FILE='', MASTER_LOG_POS=<NUM>; 6 CHANGE MASTER 'master5' TO master_use_gtid = slave_pos; line -[00] YYYY-MM-DD hh:mm:ss MySQL slave binlog position: gtid_slave_pos '<NUM-NUM-NUM>,<NUM-NUM-NUM>'; master '' master_use_gtid = slave_pos; master 'master2' filename '' position '0'; master 'master3' master_use_gtid = slave_pos; master 'master4' filename '' position '0'; master 'master5' master_use_gtid = slave_pos +[00] YYYY-MM-DD hh:mm:ss MySQL slave binlog position: gtid_slave_pos '<NUM-NUM-NUM>,<NUM-NUM-NUM>'; master '' master_use_gtid = slave_pos; master 'master2' master_use_gtid = slave_pos; master 'master3' master_use_gtid = slave_pos; master 'master4' filename '' position '0'; master 'master5' master_use_gtid = slave_pos RESET SLAVE ALL; RESET SLAVE 'master2' ALL; RESET SLAVE 'master3' ALL; RESET SLAVE 'master4' ALL; +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' RESET SLAVE 'master5' ALL; # # End of 10.2 tests diff --git a/mysql-test/suite/multi_source/gtid.result b/mysql-test/suite/multi_source/gtid.result index 0ed1062b70f..6530bb744ac 100644 --- a/mysql-test/suite/multi_source/gtid.result +++ b/mysql-test/suite/multi_source/gtid.result @@ -47,8 +47,8 @@ connection master2; INSERT INTO t2 VALUES (2, "switch1"); INSERT INTO t3 VALUES (202, "switch1 b"); connection slave2; -CHANGE MASTER 'slave1' TO master_port=MYPORT_1, master_host='127.0.0.1', master_user='root', master_use_gtid=current_pos; -CHANGE MASTER 'slave2' TO master_port=MYPORT_2, master_host='127.0.0.1', master_user='root', master_use_gtid=current_pos; +CHANGE MASTER 'slave1' TO master_port=MYPORT_1, master_host='127.0.0.1', master_user='root'; +CHANGE MASTER 'slave2' TO master_port=MYPORT_2, master_host='127.0.0.1', master_user='root'; SET default_master_connection = 'slave1'; START SLAVE; include/wait_for_slave_to_start.inc @@ -75,7 +75,7 @@ INSERT INTO t3 VALUES (204, "switch 3 b"); connection slave2; include/sync_with_master_gtid.inc connection slave1; -CHANGE MASTER TO master_port=MYPORT_4, master_host='127.0.0.1', master_user='root', master_use_gtid=current_pos; +CHANGE MASTER TO master_port=MYPORT_4, master_host='127.0.0.1', master_user='root'; START SLAVE; SELECT * FROM t1 ORDER BY a; a b diff --git a/mysql-test/suite/multi_source/gtid.test b/mysql-test/suite/multi_source/gtid.test index c81ca20a254..9fc7a66893c 100644 --- a/mysql-test/suite/multi_source/gtid.test +++ b/mysql-test/suite/multi_source/gtid.test @@ -73,9 +73,9 @@ INSERT INTO t3 VALUES (202, "switch1 b"); --connection slave2 --replace_result $SERVER_MYPORT_1 MYPORT_1 -eval CHANGE MASTER 'slave1' TO master_port=$SERVER_MYPORT_1, master_host='127.0.0.1', master_user='root', master_use_gtid=current_pos; +eval CHANGE MASTER 'slave1' TO master_port=$SERVER_MYPORT_1, master_host='127.0.0.1', master_user='root'; --replace_result $SERVER_MYPORT_2 MYPORT_2 -eval CHANGE MASTER 'slave2' TO master_port=$SERVER_MYPORT_2, master_host='127.0.0.1', master_user='root', master_use_gtid=current_pos; +eval CHANGE MASTER 'slave2' TO master_port=$SERVER_MYPORT_2, master_host='127.0.0.1', master_user='root'; SET default_master_connection = 'slave1'; START SLAVE; --source include/wait_for_slave_to_start.inc @@ -125,7 +125,7 @@ INSERT INTO t3 VALUES (204, "switch 3 b"); --connection slave1 --replace_result $SERVER_MYPORT_4 MYPORT_4 -eval CHANGE MASTER TO master_port=$SERVER_MYPORT_4, master_host='127.0.0.1', master_user='root', master_use_gtid=current_pos; +eval CHANGE MASTER TO master_port=$SERVER_MYPORT_4, master_host='127.0.0.1', master_user='root'; START SLAVE; --let $wait_condition= SELECT (SELECT COUNT(*) FROM t1)=3 AND (SELECT COUNT(*) FROM t2)=4 AND (SELECT COUNT(*) FROM t3)=7 --source include/wait_condition.inc diff --git a/mysql-test/suite/multi_source/info_logs.result b/mysql-test/suite/multi_source/info_logs.result index b0a112aaf3b..c19620b46cc 100644 --- a/mysql-test/suite/multi_source/info_logs.result +++ b/mysql-test/suite/multi_source/info_logs.result @@ -10,7 +10,8 @@ multi-master.info change master 'master1' to master_port=MYPORT_1, master_host='127.0.0.1', -master_user='root'; +master_user='root', +master_use_gtid=no; start slave 'master1'; set default_master_connection = 'master1'; include/wait_for_slave_to_start.inc @@ -28,7 +29,8 @@ master1 change master 'MASTER 2.2' to master_port=MYPORT_2, master_host='127.0.0.1', -master_user='root'; +master_user='root', +master_use_gtid=no; start slave 'MASTER 2.2'; set default_master_connection = 'MASTER 2.2'; include/wait_for_slave_to_start.inc @@ -53,6 +55,8 @@ stop slave 'master1'; set default_master_connection = 'master1'; include/wait_for_slave_to_stop.inc reset slave 'master1' all; +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' # # List of files matching '*info*' pattern # after 'master1' was completely reset, 'MASTER 2.2' still running @@ -69,7 +73,8 @@ set default_master_connection = ''; change master to master_port=MYPORT_1, master_host='127.0.0.1', -master_user='root'; +master_user='root', +master_use_gtid=no; start slave; include/wait_for_slave_to_start.inc connect master1,127.0.0.1,root,,,$SERVER_MYPORT_1; diff --git a/mysql-test/suite/multi_source/info_logs.test b/mysql-test/suite/multi_source/info_logs.test index 234e317e5ce..f8352978645 100644 --- a/mysql-test/suite/multi_source/info_logs.test +++ b/mysql-test/suite/multi_source/info_logs.test @@ -30,7 +30,8 @@ eval change master 'master1' to master_port=$SERVER_MYPORT_1, master_host='127.0.0.1', -master_user='root'; +master_user='root', +master_use_gtid=no; start slave 'master1'; set default_master_connection = 'master1'; @@ -54,7 +55,8 @@ set default_master_connection = 'master1'; eval change master 'MASTER 2.2' to master_port=$SERVER_MYPORT_2, master_host='127.0.0.1', -master_user='root'; +master_user='root', +master_use_gtid=no; start slave 'MASTER 2.2'; set default_master_connection = 'MASTER 2.2'; @@ -107,7 +109,8 @@ set default_master_connection = ''; eval change master to master_port=$SERVER_MYPORT_1, master_host='127.0.0.1', -master_user='root'; +master_user='root', +master_use_gtid=no; start slave; --source include/wait_for_slave_to_start.inc diff --git a/mysql-test/suite/multi_source/mdev-8874.result b/mysql-test/suite/multi_source/mdev-8874.result index aa9cc39b403..12bc251f4e2 100644 --- a/mysql-test/suite/multi_source/mdev-8874.result +++ b/mysql-test/suite/multi_source/mdev-8874.result @@ -24,9 +24,9 @@ insert into t1 values(1); create table t2(a int); insert into t2 values(1); connection server_4; -change master 'm1' to master_port=MYPORT_1 , master_host='127.0.0.1', master_user='root'; -change master 'm2' to master_port=MYPORT_2 , master_host='127.0.0.1', master_user='root'; -change master to master_port=MYPORT_3 , master_host='127.0.0.1', master_user='root'; +change master 'm1' to master_port=MYPORT_1 , master_host='127.0.0.1', master_user='root', master_use_gtid=no; +change master 'm2' to master_port=MYPORT_2 , master_host='127.0.0.1', master_user='root', master_use_gtid=no; +change master to master_port=MYPORT_3 , master_host='127.0.0.1', master_user='root', master_use_gtid=no; start all slaves; set default_master_connection = 'm1'; include/wait_for_slave_to_start.inc @@ -65,14 +65,20 @@ Note 1938 SLAVE 'm2' stopped Note 1938 SLAVE '' stopped Note 1938 SLAVE 'm1' stopped RESET SLAVE 'm1' ALL ; +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' RESET SLAVE 'm2' ALL ; +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' RESET SLAVE ALL ; +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' drop database a; drop database b; drop database c; -change master 'm1' to master_port=MYPORT_1 , master_host='127.0.0.1', master_user='root'; -change master 'm2' to master_port=MYPORT_2 , master_host='127.0.0.1', master_user='root'; -change master to master_port=MYPORT_3 , master_host='127.0.0.1', master_user='root'; +change master 'm1' to master_port=MYPORT_1 , master_host='127.0.0.1', master_user='root', master_use_gtid=no; +change master 'm2' to master_port=MYPORT_2 , master_host='127.0.0.1', master_user='root', master_use_gtid=no; +change master to master_port=MYPORT_3 , master_host='127.0.0.1', master_user='root', master_use_gtid=no; start all slaves; Warnings: Note 1937 SLAVE 'm2' started @@ -124,3 +130,6 @@ SET default_master_connection = "m2"; include/wait_for_slave_to_stop.inc SET default_master_connection = ""; include/wait_for_slave_to_stop.inc +RESET SLAVE ALL; +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' diff --git a/mysql-test/suite/multi_source/mdev-8874.test b/mysql-test/suite/multi_source/mdev-8874.test index d03c255b911..1a99ae73d9b 100644 --- a/mysql-test/suite/multi_source/mdev-8874.test +++ b/mysql-test/suite/multi_source/mdev-8874.test @@ -40,11 +40,11 @@ insert into t2 values(1); --connection server_4 --disable_warnings --replace_result $SERVER_MYPORT_1 MYPORT_1 -eval change master 'm1' to master_port=$SERVER_MYPORT_1 , master_host='127.0.0.1', master_user='root'; +eval change master 'm1' to master_port=$SERVER_MYPORT_1 , master_host='127.0.0.1', master_user='root', master_use_gtid=no; --replace_result $SERVER_MYPORT_2 MYPORT_2 -eval change master 'm2' to master_port=$SERVER_MYPORT_2 , master_host='127.0.0.1', master_user='root'; +eval change master 'm2' to master_port=$SERVER_MYPORT_2 , master_host='127.0.0.1', master_user='root', master_use_gtid=no; --replace_result $SERVER_MYPORT_3 MYPORT_3 -eval change master to master_port=$SERVER_MYPORT_3 , master_host='127.0.0.1', master_user='root'; +eval change master to master_port=$SERVER_MYPORT_3 , master_host='127.0.0.1', master_user='root', master_use_gtid=no; start all slaves; set default_master_connection = 'm1'; --source include/wait_for_slave_to_start.inc @@ -78,11 +78,11 @@ drop database a; drop database b; drop database c; --replace_result $SERVER_MYPORT_1 MYPORT_1 -eval change master 'm1' to master_port=$SERVER_MYPORT_1 , master_host='127.0.0.1', master_user='root'; +eval change master 'm1' to master_port=$SERVER_MYPORT_1 , master_host='127.0.0.1', master_user='root', master_use_gtid=no; --replace_result $SERVER_MYPORT_2 MYPORT_2 -eval change master 'm2' to master_port=$SERVER_MYPORT_2 , master_host='127.0.0.1', master_user='root'; +eval change master 'm2' to master_port=$SERVER_MYPORT_2 , master_host='127.0.0.1', master_user='root', master_use_gtid=no; --replace_result $SERVER_MYPORT_3 MYPORT_3 -eval change master to master_port=$SERVER_MYPORT_3 , master_host='127.0.0.1', master_user='root'; +eval change master to master_port=$SERVER_MYPORT_3 , master_host='127.0.0.1', master_user='root', master_use_gtid=no; start all slaves; set default_master_connection = 'm1'; --source include/wait_for_slave_to_start.inc @@ -139,3 +139,4 @@ SET default_master_connection = "m2"; --source include/wait_for_slave_to_stop.inc SET default_master_connection = ""; --source include/wait_for_slave_to_stop.inc +RESET SLAVE ALL; diff --git a/mysql-test/suite/multi_source/mdev-9544.result b/mysql-test/suite/multi_source/mdev-9544.result index 42e6b6a9f56..452964fd862 100644 --- a/mysql-test/suite/multi_source/mdev-9544.result +++ b/mysql-test/suite/multi_source/mdev-9544.result @@ -24,9 +24,9 @@ insert into t1 values(1); create table t2(a int); insert into t2 values(1); connection server_4; -change master 'm1' to master_port=MYPORT_1 , master_host='127.0.0.1', master_user='root'; -change master 'm2' to master_port=MYPORT_2 , master_host='127.0.0.1', master_user='root'; -change master to master_port=MYPORT_3 , master_host='127.0.0.1', master_user='root'; +change master 'm1' to master_port=MYPORT_1 , master_host='127.0.0.1', master_user='root', master_use_gtid=no; +change master 'm2' to master_port=MYPORT_2 , master_host='127.0.0.1', master_user='root', master_use_gtid=no; +change master to master_port=MYPORT_3 , master_host='127.0.0.1', master_user='root', master_use_gtid=no; start all slaves; set default_master_connection = 'm1'; include/wait_for_slave_to_start.inc @@ -88,3 +88,6 @@ SET default_master_connection = "m2"; include/wait_for_slave_to_stop.inc SET default_master_connection = ""; include/wait_for_slave_to_stop.inc +change master to master_use_gtid=slave_pos; +change master 'm1' to master_use_gtid=slave_pos; +change master 'm2' to master_use_gtid=slave_pos; diff --git a/mysql-test/suite/multi_source/mdev-9544.test b/mysql-test/suite/multi_source/mdev-9544.test index f532a63a585..fd89bdfa744 100644 --- a/mysql-test/suite/multi_source/mdev-9544.test +++ b/mysql-test/suite/multi_source/mdev-9544.test @@ -37,11 +37,11 @@ insert into t2 values(1); --connection server_4 --disable_warnings --replace_result $SERVER_MYPORT_1 MYPORT_1 -eval change master 'm1' to master_port=$SERVER_MYPORT_1 , master_host='127.0.0.1', master_user='root'; +eval change master 'm1' to master_port=$SERVER_MYPORT_1 , master_host='127.0.0.1', master_user='root', master_use_gtid=no; --replace_result $SERVER_MYPORT_2 MYPORT_2 -eval change master 'm2' to master_port=$SERVER_MYPORT_2 , master_host='127.0.0.1', master_user='root'; +eval change master 'm2' to master_port=$SERVER_MYPORT_2 , master_host='127.0.0.1', master_user='root', master_use_gtid=no; --replace_result $SERVER_MYPORT_3 MYPORT_3 -eval change master to master_port=$SERVER_MYPORT_3 , master_host='127.0.0.1', master_user='root'; +eval change master to master_port=$SERVER_MYPORT_3 , master_host='127.0.0.1', master_user='root', master_use_gtid=no; start all slaves; set default_master_connection = 'm1'; --source include/wait_for_slave_to_start.inc @@ -114,3 +114,7 @@ SET default_master_connection = "m2"; SET default_master_connection = ""; --source include/wait_for_slave_to_stop.inc +# Reset for check-testcase +change master to master_use_gtid=slave_pos; +change master 'm1' to master_use_gtid=slave_pos; +change master 'm2' to master_use_gtid=slave_pos; diff --git a/mysql-test/suite/multi_source/multi_source_slave_alias_replica.result b/mysql-test/suite/multi_source/multi_source_slave_alias_replica.result index b1aa31d059a..25cd85d7018 100644 --- a/mysql-test/suite/multi_source/multi_source_slave_alias_replica.result +++ b/mysql-test/suite/multi_source/multi_source_slave_alias_replica.result @@ -64,7 +64,7 @@ Replicate_Ignore_Server_Ids Master_Server_Id 1 Master_SSL_Crl Master_SSL_Crlpath -Using_Gtid No +Using_Gtid Slave_Pos Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids @@ -125,7 +125,7 @@ Replicate_Ignore_Server_Ids Master_Server_Id 2 Master_SSL_Crl Master_SSL_Crlpath -Using_Gtid No +Using_Gtid Slave_Pos Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids diff --git a/mysql-test/suite/multi_source/multisource.result b/mysql-test/suite/multi_source/multisource.result index ad1f2e24f9e..4b53b4653cd 100644 --- a/mysql-test/suite/multi_source/multisource.result +++ b/mysql-test/suite/multi_source/multisource.result @@ -99,7 +99,8 @@ set default_master_connection = ''; change master to master_port=MYPORT_2, master_host='127.0.0.1', -master_user='root'; +master_user='root', +master_use_gtid=no; start slave; include/wait_for_slave_to_start.inc # diff --git a/mysql-test/suite/multi_source/multisource_for_channel.result b/mysql-test/suite/multi_source/multisource_for_channel.result index cb1224b416f..9b4efae09b5 100644 --- a/mysql-test/suite/multi_source/multisource_for_channel.result +++ b/mysql-test/suite/multi_source/multisource_for_channel.result @@ -7,7 +7,8 @@ ERROR HY000: Incorrect arguments to MASTER_HOST change master to master_port=MYPORT_1, master_host='127.0.0.1', -master_user='root' +master_user='root', +master_use_gtid=no for channel 'master1'; start slave for channel 'master1'; set default_master_connection = 'master1'; @@ -102,7 +103,8 @@ set default_master_connection = ''; change master to master_port=MYPORT_2, master_host='127.0.0.1', -master_user='root'; +master_user='root', +master_use_gtid=no; start slave; include/wait_for_slave_to_start.inc # @@ -322,6 +324,8 @@ Last_SQL_Errno = '0' # reset slave # RESET SLAVE for channel 'master1'; +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' show slave status for channel 'master1' Master_Port = 'MYPORT_1' diff --git a/mysql-test/suite/multi_source/multisource_for_channel.test b/mysql-test/suite/multi_source/multisource_for_channel.test index a95b272d5b1..b3feb4b9da6 100644 --- a/mysql-test/suite/multi_source/multisource_for_channel.test +++ b/mysql-test/suite/multi_source/multisource_for_channel.test @@ -29,7 +29,8 @@ change master to master_host='' for channel 'abc2'; eval change master to master_port=$SERVER_MYPORT_1, master_host='127.0.0.1', -master_user='root' +master_user='root', +master_use_gtid=no for channel 'master1'; start slave for channel 'master1'; @@ -154,7 +155,8 @@ set default_master_connection = ''; eval change master to master_port=$SERVER_MYPORT_2, master_host='127.0.0.1', -master_user='root'; +master_user='root', +master_use_gtid=no; start slave; --source include/wait_for_slave_to_start.inc diff --git a/mysql-test/suite/multi_source/reset_slave.result b/mysql-test/suite/multi_source/reset_slave.result index c048784e28d..a55a6ec235f 100644 --- a/mysql-test/suite/multi_source/reset_slave.result +++ b/mysql-test/suite/multi_source/reset_slave.result @@ -14,14 +14,14 @@ connection slave; stop slave 'master1'; show slave 'master1' status; Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Parallel_Mode SQL_Delay SQL_Remaining_Delay Slave_SQL_Running_State Slave_DDL_Groups Slave_Non_Transactional_Groups Slave_Transactional_Groups - 127.0.0.1 root MYPORT_1 60 master-bin.000001 <read_master_log_pos> mysqld-relay-bin-master1.000002 <relay_log_pos> master-bin.000001 No No 0 0 <read_master_log_pos> <relay_log_space> None 0 No NULL No 0 0 1 No optimistic 0 NULL 2 1 0 + 127.0.0.1 root MYPORT_1 60 master-bin.000001 <read_master_log_pos> mysqld-relay-bin-master1.000002 <relay_log_pos> master-bin.000001 No No 0 0 <read_master_log_pos> <relay_log_space> None 0 No NULL No 0 0 1 Slave_Pos 0-1-3 optimistic 0 NULL 2 1 0 mysqld-relay-bin-master1.000001 mysqld-relay-bin-master1.000002 mysqld-relay-bin-master1.index reset slave 'master1'; show slave 'master1' status; Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Parallel_Mode SQL_Delay SQL_Remaining_Delay Slave_SQL_Running_State Slave_DDL_Groups Slave_Non_Transactional_Groups Slave_Transactional_Groups - 127.0.0.1 root MYPORT_1 60 4 <relay_log_pos> No No 0 0 0 <relay_log_space> None 0 No NULL No 0 0 1 No optimistic 0 NULL 2 1 0 + 127.0.0.1 root MYPORT_1 60 4 <relay_log_pos> No No 0 0 0 <relay_log_space> None 0 No NULL No 0 0 1 Slave_Pos optimistic 0 NULL 2 1 0 reset slave 'master1' all; show slave 'master1' status; ERROR HY000: There is no master connection 'master1' diff --git a/mysql-test/suite/multi_source/simple.result b/mysql-test/suite/multi_source/simple.result index 191cd0a1a0f..5a167907b3b 100644 --- a/mysql-test/suite/multi_source/simple.result +++ b/mysql-test/suite/multi_source/simple.result @@ -62,7 +62,7 @@ Replicate_Ignore_Server_Ids Master_Server_Id 1 Master_SSL_Crl Master_SSL_Crlpath -Using_Gtid No +Using_Gtid Slave_Pos Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids @@ -123,7 +123,7 @@ Replicate_Ignore_Server_Ids Master_Server_Id 2 Master_SSL_Crl Master_SSL_Crlpath -Using_Gtid No +Using_Gtid Slave_Pos Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids @@ -148,7 +148,7 @@ CHANNEL_NAME slave2 HOST 127.0.0.1 PORT # USER root -USING_GTID NO +USING_GTID SLAVE_POS SSL_ALLOWED NO SSL_CA_FILE SSL_CA_PATH @@ -168,7 +168,7 @@ CHANNEL_NAME slave1 HOST 127.0.0.1 PORT # USER root -USING_GTID NO +USING_GTID SLAVE_POS SSL_ALLOWED NO SSL_CA_FILE SSL_CA_PATH @@ -249,7 +249,7 @@ Replicate_Ignore_Server_Ids Master_Server_Id 1 Master_SSL_Crl Master_SSL_Crlpath -Using_Gtid No +Using_Gtid Slave_Pos Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids @@ -306,7 +306,7 @@ Replicate_Ignore_Server_Ids Master_Server_Id 1 Master_SSL_Crl Master_SSL_Crlpath -Using_Gtid No +Using_Gtid Slave_Pos Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids @@ -367,7 +367,7 @@ Replicate_Ignore_Server_Ids Master_Server_Id 2 Master_SSL_Crl Master_SSL_Crlpath -Using_Gtid No +Using_Gtid Slave_Pos Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids @@ -430,7 +430,7 @@ Replicate_Ignore_Server_Ids Master_Server_Id 2 Master_SSL_Crl Master_SSL_Crlpath -Using_Gtid No +Using_Gtid Slave_Pos Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids @@ -495,7 +495,7 @@ Replicate_Ignore_Server_Ids Master_Server_Id 2 Master_SSL_Crl Master_SSL_Crlpath -Using_Gtid No +Using_Gtid Slave_Pos Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids diff --git a/mysql-test/suite/multi_source/skip_counter.result b/mysql-test/suite/multi_source/skip_counter.result index 03103af21b9..4573d54ca38 100644 --- a/mysql-test/suite/multi_source/skip_counter.result +++ b/mysql-test/suite/multi_source/skip_counter.result @@ -12,7 +12,8 @@ connect slave,127.0.0.1,root,,,$SERVER_MYPORT_3; change master 'master1' to master_port=MYPORT_1, master_host='127.0.0.1', -master_user='root'; +master_user='root', +master_use_gtid=no; start slave 'master1'; set default_master_connection = 'master1'; include/wait_for_slave_to_start.inc @@ -20,7 +21,8 @@ set default_master_connection = 'master2'; change master 'master2' to master_port=MYPORT_2, master_host='127.0.0.1', -master_user='root'; +master_user='root', +master_use_gtid=no; set global sql_slave_skip_counter = 2; select @@global.sql_slave_skip_counter; @@global.sql_slave_skip_counter diff --git a/mysql-test/suite/multi_source/skip_counter.test b/mysql-test/suite/multi_source/skip_counter.test index e53d0276a91..e89480f55c5 100644 --- a/mysql-test/suite/multi_source/skip_counter.test +++ b/mysql-test/suite/multi_source/skip_counter.test @@ -38,7 +38,8 @@ create table db.t3 (i int) engine=MyISAM; eval change master 'master1' to master_port=$SERVER_MYPORT_1, master_host='127.0.0.1', -master_user='root'; +master_user='root', +master_use_gtid=no; start slave 'master1'; set default_master_connection = 'master1'; @@ -53,7 +54,8 @@ set default_master_connection = 'master2'; eval change master 'master2' to master_port=$SERVER_MYPORT_2, master_host='127.0.0.1', -master_user='root'; +master_user='root', +master_use_gtid=no; # the schema creation will be replicated from the 1st master, # so we want to skip it in the second replication connection diff --git a/mysql-test/suite/parts/r/rpl_partition.result b/mysql-test/suite/parts/r/rpl_partition.result index 0ec36a2c72a..6378e0ef834 100644 --- a/mysql-test/suite/parts/r/rpl_partition.result +++ b/mysql-test/suite/parts/r/rpl_partition.result @@ -128,7 +128,7 @@ show create table t3; Table t3 Create Table CREATE TABLE `t3` ( `id` mediumint(9) NOT NULL AUTO_INCREMENT, - `dt` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `dt` timestamp NULL DEFAULT NULL, `user` char(255) DEFAULT NULL, `uuidf` longblob DEFAULT NULL, `fkid` mediumint(9) DEFAULT NULL, diff --git a/mysql-test/suite/perfschema/r/digest_view.result b/mysql-test/suite/perfschema/r/digest_view.result index a5996cc0083..3fd7a090459 100644 --- a/mysql-test/suite/perfschema/r/digest_view.result +++ b/mysql-test/suite/perfschema/r/digest_view.result @@ -191,17 +191,17 @@ SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR FROM performance_schema.events_statements_summary_by_digest ORDER BY DIGEST_TEXT; SCHEMA_NAME DIGEST DIGEST_TEXT COUNT_STAR -test 27a9ab161a63050c84a63c6f77ebeb33 EXPLAIN SELECT * FROM `test` . `v1` 1 -test ab0ab27c04f3a294feb86bede4331f86 EXPLAIN SELECT * FROM `test` . `v1` WHERE `a` = ? 1 -test 2e722346a5c2ef820946bcd04ccac208 EXPLAIN SELECT * FROM `test` . `v1` WHERE `b` > ? 1 -test 07baf2264db30b6b25302603436ebe82 EXPLAIN SELECT `a` , `b` FROM `test` . `v1` 1 -test 3a7dbc963635ab0de6e160e0a4212bce EXPLAIN SELECT `b` , `a` FROM `test` . `v1` 1 -test 6b845c2e3a7421997e3b610d14b5c842 SELECT * FROM `test` . `v1` 1 -test cb2ee099edbf6e0e5ee6ae14f3b1498a SELECT * FROM `test` . `v1` WHERE `a` = ? 1 -test e2dc5a300d2ba54ebb987a2ca6b90d93 SELECT * FROM `test` . `v1` WHERE `b` > ? 1 -test c68e0f99323f7bb7732c7b5cf32c0ec2 SELECT `a` , `b` FROM `test` . `v1` 1 -test 43c5de955c9a72d2bb6f49db5c0ad3e7 SELECT `b` , `a` FROM `test` . `v1` 1 -test 1678258ba15f7ccc63fd7b833763914a TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1 +test 333a53e537d74bf74dd28c78ad5b23dd EXPLAIN SELECT * FROM `test` . `v1` 1 +test 1fb578da66e6583bae8e64061486f1b1 EXPLAIN SELECT * FROM `test` . `v1` WHERE `a` = ? 1 +test 923bca939a55826e231e1335016ba418 EXPLAIN SELECT * FROM `test` . `v1` WHERE `b` > ? 1 +test 6fa6d75432fd499d1c7d6f964c8310a2 EXPLAIN SELECT `a` , `b` FROM `test` . `v1` 1 +test 3421da1ec8ecb8cac97e12a0609f73cb EXPLAIN SELECT `b` , `a` FROM `test` . `v1` 1 +test c2f68fd41bfbf3acd52eb5e7306b0c00 SELECT * FROM `test` . `v1` 1 +test dd68812cbe4c1ed5a38921222981f8c5 SELECT * FROM `test` . `v1` WHERE `a` = ? 1 +test 7563bcc32c6d0d872c8d9f0bf7717e6a SELECT * FROM `test` . `v1` WHERE `b` > ? 1 +test 0817c53833dc6adbca581e8fe4c598c7 SELECT `a` , `b` FROM `test` . `v1` 1 +test a5f13903c70812ae08fa8c084e9cd503 SELECT `b` , `a` FROM `test` . `v1` 1 +test 66b14a14f2a42e1335dd28dfad8ea084 TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1 DROP TABLE test.v1; CREATE VIEW test.v1 AS SELECT * FROM test.t1; EXPLAIN SELECT * from test.v1; @@ -248,19 +248,19 @@ SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR FROM performance_schema.events_statements_summary_by_digest ORDER BY DIGEST_TEXT; SCHEMA_NAME DIGEST DIGEST_TEXT COUNT_STAR -test 342cd5e41944d5f857f92b1e374857de CREATE VIEW `test` . `v1` AS SELECT * FROM `test` . `t1` 1 -test 2653f30030efcb6125121daa8eadf418 DROP TABLE `test` . `v1` 1 -test 27a9ab161a63050c84a63c6f77ebeb33 EXPLAIN SELECT * FROM `test` . `v1` 2 -test ab0ab27c04f3a294feb86bede4331f86 EXPLAIN SELECT * FROM `test` . `v1` WHERE `a` = ? 2 -test 2e722346a5c2ef820946bcd04ccac208 EXPLAIN SELECT * FROM `test` . `v1` WHERE `b` > ? 2 -test 07baf2264db30b6b25302603436ebe82 EXPLAIN SELECT `a` , `b` FROM `test` . `v1` 2 -test 3a7dbc963635ab0de6e160e0a4212bce EXPLAIN SELECT `b` , `a` FROM `test` . `v1` 2 -test 6b845c2e3a7421997e3b610d14b5c842 SELECT * FROM `test` . `v1` 2 -test cb2ee099edbf6e0e5ee6ae14f3b1498a SELECT * FROM `test` . `v1` WHERE `a` = ? 2 -test e2dc5a300d2ba54ebb987a2ca6b90d93 SELECT * FROM `test` . `v1` WHERE `b` > ? 2 -test a13cfeda6d474d29546719d76dcfa831 SELECT SCHEMA_NAME , `DIGEST` , `DIGEST_TEXT` , `COUNT_STAR` FROM `performance_schema` . `events_statements_summary_by_digest` ORDER BY `DIGEST_TEXT` 1 -test c68e0f99323f7bb7732c7b5cf32c0ec2 SELECT `a` , `b` FROM `test` . `v1` 2 -test 43c5de955c9a72d2bb6f49db5c0ad3e7 SELECT `b` , `a` FROM `test` . `v1` 2 -test 1678258ba15f7ccc63fd7b833763914a TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1 +test 98531b331031b84ddfbb2de8b601a704 CREATE VIEW `test` . `v1` AS SELECT * FROM `test` . `t1` 1 +test 5352d7d117e97fecd312e354e9e290ce DROP TABLE `test` . `v1` 1 +test 333a53e537d74bf74dd28c78ad5b23dd EXPLAIN SELECT * FROM `test` . `v1` 2 +test 1fb578da66e6583bae8e64061486f1b1 EXPLAIN SELECT * FROM `test` . `v1` WHERE `a` = ? 2 +test 923bca939a55826e231e1335016ba418 EXPLAIN SELECT * FROM `test` . `v1` WHERE `b` > ? 2 +test 6fa6d75432fd499d1c7d6f964c8310a2 EXPLAIN SELECT `a` , `b` FROM `test` . `v1` 2 +test 3421da1ec8ecb8cac97e12a0609f73cb EXPLAIN SELECT `b` , `a` FROM `test` . `v1` 2 +test c2f68fd41bfbf3acd52eb5e7306b0c00 SELECT * FROM `test` . `v1` 2 +test dd68812cbe4c1ed5a38921222981f8c5 SELECT * FROM `test` . `v1` WHERE `a` = ? 2 +test 7563bcc32c6d0d872c8d9f0bf7717e6a SELECT * FROM `test` . `v1` WHERE `b` > ? 2 +test 21c19dd7ef5b894f3e32d0585cb3007f SELECT SCHEMA_NAME , `DIGEST` , `DIGEST_TEXT` , `COUNT_STAR` FROM `performance_schema` . `events_statements_summary_by_digest` ORDER BY `DIGEST_TEXT` 1 +test 0817c53833dc6adbca581e8fe4c598c7 SELECT `a` , `b` FROM `test` . `v1` 2 +test a5f13903c70812ae08fa8c084e9cd503 SELECT `b` , `a` FROM `test` . `v1` 2 +test 66b14a14f2a42e1335dd28dfad8ea084 TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1 DROP VIEW test.v1; DROP TABLE test.t1; diff --git a/mysql-test/suite/perfschema/r/start_server_low_digest_sql_length.result b/mysql-test/suite/perfschema/r/start_server_low_digest_sql_length.result index 13b51569b60..ff554155f33 100644 --- a/mysql-test/suite/perfschema/r/start_server_low_digest_sql_length.result +++ b/mysql-test/suite/perfschema/r/start_server_low_digest_sql_length.result @@ -8,5 +8,5 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1 #################################### SELECT event_name, digest, digest_text, sql_text FROM events_statements_history_long; event_name digest digest_text sql_text -statement/sql/select 1fd0cdb6b5aa22bd0809a39b2dc2ac70 SELECT ? + ? + SELECT ... -statement/sql/truncate 0a9c405cebde6df4be315dae86ff398a TRUNCATE TABLE truncat... +statement/sql/select 96a6bb95edaf100857f09c968aca354b SELECT ? + ? + SELECT ... +statement/sql/truncate c1d647bb870f2c63c22a16707bb8aee3 TRUNCATE TABLE truncat... diff --git a/mysql-test/suite/perfschema/t/show_sanity.test b/mysql-test/suite/perfschema/t/show_sanity.test index 171bbfa8bd6..3ca88b556f8 100644 --- a/mysql-test/suite/perfschema/t/show_sanity.test +++ b/mysql-test/suite/perfschema/t/show_sanity.test @@ -496,7 +496,6 @@ insert into test.sanity values ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_UNDO_LOG_TRUNCATE"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_UNDO_TABLESPACES"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_USE_NATIVE_AIO"), - ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_VERSION"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_WRITE_IO_THREADS"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INTERNAL_TMP_DISK_STORAGE_ENGINE"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "KEY_BUFFER_SIZE"), diff --git a/mysql-test/suite/period/r/create.result b/mysql-test/suite/period/r/create.result index e5fa2d1797d..ad9985d792e 100644 --- a/mysql-test/suite/period/r/create.result +++ b/mysql-test/suite/period/r/create.result @@ -16,8 +16,8 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `id` int(11) NOT NULL, - `s` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000', - `e` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000', + `s` timestamp(6) NOT NULL, + `e` timestamp(6) NOT NULL, PERIOD FOR `mytime` (`s`, `e`), PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci diff --git a/mysql-test/suite/plugins/r/test_sql_service.result b/mysql-test/suite/plugins/r/test_sql_service.result index e5f09b67b6b..2983da28cc9 100644 --- a/mysql-test/suite/plugins/r/test_sql_service.result +++ b/mysql-test/suite/plugins/r/test_sql_service.result @@ -67,7 +67,7 @@ set global test_sql_service_execute_sql_global= 'drop table test.t1'; show status like 'test_sql_query_result'; Variable_name Value Test_sql_query_result Error 1051 returned. Unknown table 'test.t1' -create table t1 (id int, time timestamp); +create table t1 (id int, time timestamp not null default now()); insert into t1 values (1, NULL), (2, NULL), (3, NULL), (4, NULL), (5, NULL); set global test_sql_service_execute_sql_global= 'select * FROM test.t1 WHERE time < DATE_SUB(NOW(), interval 5 minute)'; show status like 'test_sql_query_result'; diff --git a/mysql-test/suite/plugins/t/test_sql_service.test b/mysql-test/suite/plugins/t/test_sql_service.test index 0a45cb663f4..2f53c1d5b3e 100644 --- a/mysql-test/suite/plugins/t/test_sql_service.test +++ b/mysql-test/suite/plugins/t/test_sql_service.test @@ -61,7 +61,7 @@ show status like 'test_sql_query_result'; set global test_sql_service_execute_sql_global= 'drop table test.t1'; show status like 'test_sql_query_result'; -create table t1 (id int, time timestamp); +create table t1 (id int, time timestamp not null default now()); insert into t1 values (1, NULL), (2, NULL), (3, NULL), (4, NULL), (5, NULL); set global test_sql_service_execute_sql_global= 'select * FROM test.t1 WHERE time < DATE_SUB(NOW(), interval 5 minute)'; show status like 'test_sql_query_result'; diff --git a/mysql-test/suite/rpl/include/multisource.inc b/mysql-test/suite/rpl/include/multisource.inc index 7a2d9ea79b2..96c4a9aa348 100644 --- a/mysql-test/suite/rpl/include/multisource.inc +++ b/mysql-test/suite/rpl/include/multisource.inc @@ -159,7 +159,8 @@ set default_master_connection = ''; eval change master to master_port=$SERVER_MYPORT_2, master_host='127.0.0.1', -master_user='root'; +master_user='root', +master_use_gtid=no; start slave; --source include/wait_for_slave_to_start.inc diff --git a/mysql-test/suite/rpl/include/rpl_binlog_errors.inc b/mysql-test/suite/rpl/include/rpl_binlog_errors.inc index bf92736a2af..ab95c9b4ee3 100644 --- a/mysql-test/suite/rpl/include/rpl_binlog_errors.inc +++ b/mysql-test/suite/rpl/include/rpl_binlog_errors.inc @@ -389,6 +389,11 @@ RESET MASTER; --source include/rpl_reset.inc -- connection slave +# Slave tests rely on logic of non-gtid mode +--source include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +--source include/start_slave.inc + # slave suppressions call mtr.add_suppression("Slave I/O: Relay log write failure: could not queue event from master.*"); diff --git a/mysql-test/suite/rpl/include/rpl_binlog_max_cache_size.test b/mysql-test/suite/rpl/include/rpl_binlog_max_cache_size.test index d750554b4ec..2634a6027a3 100644 --- a/mysql-test/suite/rpl/include/rpl_binlog_max_cache_size.test +++ b/mysql-test/suite/rpl/include/rpl_binlog_max_cache_size.test @@ -21,6 +21,13 @@ # and slave are diverging. # ######################################################################################## + +--connection slave +--source include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +--source include/start_slave.inc +--connection master + call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); call mtr.add_suppression("Write to binary log failed: Multi-row statements required more than .max_binlog_stmt_cache_size"); call mtr.add_suppression("Write to binary log failed: Multi-statement transaction required more than .max_binlog_cache_size"); diff --git a/mysql-test/suite/rpl/include/rpl_cant_read_event_incident.inc b/mysql-test/suite/rpl/include/rpl_cant_read_event_incident.inc index 7dfef023947..7c1d0ea25e2 100644 --- a/mysql-test/suite/rpl/include/rpl_cant_read_event_incident.inc +++ b/mysql-test/suite/rpl/include/rpl_cant_read_event_incident.inc @@ -22,6 +22,10 @@ --source include/master-slave.inc --connection slave +--source include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +--source include/start_slave.inc + # Make sure the slave is stopped while we are messing with master. # Otherwise we get occasional failures as the slave manages to re-connect # to the newly started master and we get extra events applied, causing @@ -49,7 +53,8 @@ show binlog events; --connection slave call mtr.add_suppression("Slave I/O: Got fatal error 1236 from master when reading data from binary log"); -reset slave; +--let $master_use_gtid_option= No +--source include/reset_slave.inc start slave; # ER_MASTER_FATAL_ERROR_READING_BINLOG 1236 diff --git a/mysql-test/suite/rpl/include/rpl_change_master_demote.inc b/mysql-test/suite/rpl/include/rpl_change_master_demote.inc new file mode 100644 index 00000000000..4c563454a5b --- /dev/null +++ b/mysql-test/suite/rpl/include/rpl_change_master_demote.inc @@ -0,0 +1,89 @@ +# +# This file tests that a master can be demoted to a slave using +# CHANGE MASTER TO MASTER_DEMOTE_TO_SLAVE=1 and replication will work correctly +# afterwards. +# +# param $ignore_domain_ids : List of GTID domain ids to use for +# CHANGE MASTER TO IGNORE_DOMAIN_IDS +# + +--let $include_filename= rpl_change_master_demote.inc +--source include/begin_include_file.inc + +--echo ############################################## +--echo # Connection semantics change: +--echo # * True primary is now connection 'slave' +--echo # * True replica is now connection 'master' +--echo ############################################## + +--connection master +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; + +--let $extra_cm_args= +if (`SELECT strcmp("$ignore_domain_ids","") != 0`) +{ + --let $extra_cm_args=, ignore_domain_ids=($ignore_domain_ids) +} + +--echo # First ensure gtid_slave_pos after master_demote_to_slave matches +--echo # gtid_current_pos calculation +--let $current_pos= `SELECT @@gtid_current_pos` +--replace_result $SLAVE_MYPORT SLAVE_PORT +--eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$SLAVE_MYPORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1 $extra_cm_args +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +--let $slave_pos= `SELECT @@gtid_slave_pos` +--echo # Validating gtid_slave_pos == gtid_binlog_pos.. +if ($slave_pos != $current_pos) +{ + SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; + die gtid_slave_pos calculation after master_demote_to_slave=1 differs from gtid_current_pos; +} +--echo # ..success + +--source include/start_slave.inc + +--connection slave +--source include/stop_slave.inc + +--echo # Ensuring replication works correctly after role swap +--connection slave +set session gtid_domain_id= 0; +CREATE TABLE repl_t (a int); +INSERT INTO repl_t VALUES (1); +--source include/save_master_gtid.inc + +--connection master +--source include/sync_with_master_gtid.inc +--echo # Validating that replication works.. +--let $n_replicated_rows= query_get_value(SELECT COUNT(*) FROM repl_t, COUNT(*), 1) +if ($n_replicated_rows != 1) +{ + die "Replication is broken"; +} +--echo # ..success + +--echo # Cleaning up replication check data +--connection slave +DROP TABLE repl_t; +--source include/save_master_gtid.inc + +--connection master +--source include/sync_with_master_gtid.inc +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; + +--echo ############################################## +--echo # Connection semantics change: +--echo # * True primary is back to connection 'master' +--echo # * True replica is back to connection 'slave' +--echo ############################################## + +--connection master +--source include/stop_slave.inc + +--connection slave +--replace_result $MASTER_MYPORT MASTER_PORT +--eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$MASTER_MYPORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1 +--source include/start_slave.inc + +--let $include_filename= rpl_change_master_demote.inc +--source include/end_include_file.inc diff --git a/mysql-test/suite/rpl/include/rpl_checksum.inc b/mysql-test/suite/rpl/include/rpl_checksum.inc index 17a986dc308..fc765744b3f 100644 --- a/mysql-test/suite/rpl/include/rpl_checksum.inc +++ b/mysql-test/suite/rpl/include/rpl_checksum.inc @@ -11,6 +11,12 @@ --source include/have_binlog_format_mixed.inc --source include/master-slave.inc +--connection slave +--source include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +--source include/start_slave.inc + +--connection master call mtr.add_suppression('Slave can not handle replication events with the checksum that master is configured to log'); call mtr.add_suppression('Replication event checksum verification failed'); # due to C failure simulation @@ -196,7 +202,8 @@ select count(*) as 'must be zero' from t2; # connection slave; stop slave; -reset slave; +--let $master_use_gtid_option= No +--source include/reset_slave.inc # randomize slave server's own checksum policy set @@global.binlog_checksum= IF(floor((rand()*1000)%2), "CRC32", "NONE"); diff --git a/mysql-test/suite/rpl/include/rpl_corruption.inc b/mysql-test/suite/rpl/include/rpl_corruption.inc index c7a913af9d7..cd2a1cc7ef2 100644 --- a/mysql-test/suite/rpl/include/rpl_corruption.inc +++ b/mysql-test/suite/rpl/include/rpl_corruption.inc @@ -24,6 +24,12 @@ --source include/have_debug.inc --source include/master-slave.inc +--connection slave +--source include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +--source include/start_slave.inc +--connection master + # Block legal errors for MTR call mtr.add_suppression('Found invalid event in binary log'); call mtr.add_suppression('Slave I/O: Relay log write failure: could not queue event from master'); diff --git a/mysql-test/suite/rpl/include/rpl_deadlock.test b/mysql-test/suite/rpl/include/rpl_deadlock.test index 53002d255f3..7fcf5cbd22c 100644 --- a/mysql-test/suite/rpl/include/rpl_deadlock.test +++ b/mysql-test/suite/rpl/include/rpl_deadlock.test @@ -88,7 +88,7 @@ connection slave; DELETE FROM t2; # Set slave position to the BEGIN log event --replace_result $master_pos_begin <master_pos_begin> -eval CHANGE MASTER TO MASTER_LOG_POS=$master_pos_begin; +eval CHANGE MASTER TO MASTER_LOG_POS=$master_pos_begin, MASTER_USE_GTID=NO; BEGIN; # Hold lock SELECT * FROM t1 FOR UPDATE; @@ -121,7 +121,7 @@ SET global max_relay_log_size=0; DELETE FROM t2; # Set slave position to the BEGIN log event --replace_result $master_pos_begin <master_pos_begin> -eval CHANGE MASTER TO MASTER_LOG_POS=$master_pos_begin; +eval CHANGE MASTER TO MASTER_LOG_POS=$master_pos_begin, MASTER_USE_GTID=NO; BEGIN; # Hold lock SELECT * FROM t1 FOR UPDATE; diff --git a/mysql-test/suite/rpl/include/rpl_extra_col_master.test b/mysql-test/suite/rpl/include/rpl_extra_col_master.test index 0d397b7e3ba..a7abe69db0a 100644 --- a/mysql-test/suite/rpl/include/rpl_extra_col_master.test +++ b/mysql-test/suite/rpl/include/rpl_extra_col_master.test @@ -450,7 +450,7 @@ connection master; --echo ** Stop and Reset Slave ** --echo STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc --echo --echo ** create table slave side ** eval CREATE TABLE t10 (a INT PRIMARY KEY, b BLOB, c CHAR(5) @@ -507,7 +507,7 @@ sync_slave_with_master; --echo --echo *** Create t11 on slave *** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc eval CREATE TABLE t11 (a INT PRIMARY KEY, b BLOB, c VARCHAR(254) ) ENGINE=$engine_type; @@ -563,7 +563,7 @@ sync_slave_with_master; --echo --echo *** Create t12 on slave *** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc eval CREATE TABLE t12 (a INT PRIMARY KEY, b BLOB, c BLOB ) ENGINE=$engine_type; @@ -614,7 +614,7 @@ sync_slave_with_master; --echo --echo *** Create t14 on slave *** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc eval CREATE TABLE t14 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5) ) ENGINE=$engine_type; @@ -689,7 +689,7 @@ connection slave; #*************************** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc --echo --echo *** Drop t14 *** @@ -711,7 +711,7 @@ START SLAVE; --echo --echo *** Create t15 on slave *** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc eval CREATE TABLE t15 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5) ) ENGINE=$engine_type; @@ -753,7 +753,7 @@ connection slave; --let $show_slave_sql_error= 1 --source include/wait_for_slave_sql_error.inc STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc --echo --echo *** Drop t15 *** @@ -775,7 +775,7 @@ START SLAVE; --echo --echo *** Create t16 on slave *** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc eval CREATE TABLE t16 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5) ) ENGINE=$engine_type; @@ -830,7 +830,7 @@ connection slave; --let $show_slave_sql_error= 1 --source include/wait_for_slave_sql_error.inc STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc --echo --echo *** Drop t16 *** @@ -853,7 +853,7 @@ START SLAVE; --echo --echo *** Create t17 on slave *** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc eval CREATE TABLE t17 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5) ) ENGINE=$engine_type; @@ -919,7 +919,7 @@ sync_slave_with_master; --echo STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc eval CREATE TABLE t18 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5) ) ENGINE=$engine_type; @@ -982,7 +982,7 @@ sync_slave_with_master; --echo --echo *** Create t5 on slave *** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc eval CREATE TABLE t5 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5) ) ENGINE=$engine_type; diff --git a/mysql-test/suite/rpl/include/rpl_extra_col_slave.test b/mysql-test/suite/rpl/include/rpl_extra_col_slave.test index a58fa85a72d..680d5724bea 100644 --- a/mysql-test/suite/rpl/include/rpl_extra_col_slave.test +++ b/mysql-test/suite/rpl/include/rpl_extra_col_slave.test @@ -25,7 +25,7 @@ call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]*. cannot sync_slave_with_master; STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc SET @saved_slave_type_conversions = @@slave_type_conversions; SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_NON_LOSSY'; @@ -71,7 +71,7 @@ sync_slave_with_master; ## BUG22086 --echo *** Create t2 on slave *** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc eval CREATE TABLE t2 (a INT, b INT PRIMARY KEY, c CHAR(5), d FLOAT DEFAULT '2.00', e CHAR(5) DEFAULT 'TEST2') @@ -96,7 +96,7 @@ START SLAVE; --let $show_slave_sql_error= 1 --source include/wait_for_slave_sql_error.inc STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc SELECT * FROM t2 ORDER BY a; connection master; @@ -116,7 +116,7 @@ sync_slave_with_master; #################################### --echo *** Create t3 on slave *** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc eval CREATE TABLE t3 (a INT, b INT PRIMARY KEY, c CHAR(20), d FLOAT DEFAULT '2.00', e CHAR(5) DEFAULT 'TEST2') @@ -161,7 +161,7 @@ sync_slave_with_master; --echo *** Create t4 on slave *** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc eval CREATE TABLE t4 (a INT, b INT PRIMARY KEY, c CHAR(20), d FLOAT DEFAULT '2.00', e CHAR(5) DEFAULT 'TEST2') @@ -204,7 +204,7 @@ sync_slave_with_master; --echo *** Create t5 on slave *** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc eval CREATE TABLE t5 (a INT PRIMARY KEY, b CHAR(5), c FLOAT, d INT, e DOUBLE, f DECIMAL(8,2))ENGINE=$engine_type; @@ -249,7 +249,7 @@ sync_slave_with_master; --echo *** Create t6 on slave *** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc eval CREATE TABLE t6 (a INT PRIMARY KEY, b CHAR(5), c FLOAT, d INT)ENGINE=$engine_type; @@ -307,7 +307,7 @@ DROP TABLE t6; --echo *** Create t7 on slave *** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc eval CREATE TABLE t7 (a INT KEY, b BLOB, c CHAR(5), d TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00', e CHAR(20) DEFAULT 'Extra Column Testing') @@ -349,7 +349,7 @@ sync_slave_with_master; ########################################### --echo *** Create t8 on slave *** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc eval CREATE TABLE t8 (a INT KEY, b BLOB, c CHAR(5), d TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00', e INT)ENGINE=$engine_type; @@ -395,7 +395,7 @@ sync_slave_with_master; # Error reaction is up to sql_mode of the slave sql (bug#38173) #--echo *** Create t9 on slave *** STOP SLAVE; - RESET SLAVE; + --source include/reset_slave.inc eval CREATE TABLE t9 (a INT KEY, b BLOB, c CHAR(5), d TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, @@ -449,7 +449,7 @@ sync_slave_with_master; ############################################ --echo *** Create t10 on slave *** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc eval CREATE TABLE t10 (a INT KEY, b BLOB, f DOUBLE DEFAULT '233', c CHAR(5), e INT DEFAULT '1')ENGINE=$engine_type; @@ -491,7 +491,7 @@ sync_slave_with_master; ############################################ --echo *** Create t11 on slave *** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc eval CREATE TABLE t11 (a INT KEY, b BLOB, f INT, c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE=$engine_type; @@ -533,7 +533,7 @@ sync_slave_with_master; ############################################ --echo *** Create t12 on slave *** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc eval CREATE TABLE t12 (a INT KEY, b BLOB, f TEXT, c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE=$engine_type; @@ -572,7 +572,7 @@ sync_slave_with_master; --echo *** BUG 22177 Start *** --echo *** Create t13 on slave *** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc eval CREATE TABLE t13 (a INT KEY, b BLOB, c CHAR(5), d INT DEFAULT '1', e TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP @@ -620,7 +620,7 @@ sync_slave_with_master; --echo *** Create t14 on slave *** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc eval CREATE TABLE t14 (c1 INT KEY, c4 BLOB, c5 CHAR(5), c6 INT DEFAULT '1', c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP @@ -660,7 +660,7 @@ SELECT * FROM t14 ORDER BY c1; --echo *** Create t14a on slave *** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc eval CREATE TABLE t14a (c1 INT KEY, c4 BLOB, c5 CHAR(5), c6 INT DEFAULT '1', c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP @@ -690,7 +690,7 @@ sync_slave_with_master; --replace_column 5 CURRENT_TIMESTAMP SELECT * FROM t14a ORDER BY c1; STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc --echo *** Master Drop c5 *** connection master; @@ -749,7 +749,7 @@ sync_slave_with_master; --echo *** Create t15 on slave *** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc eval CREATE TABLE t15 (c1 INT KEY, c2 DECIMAL(8,2), c3 TEXT, c4 BLOB, c5 CHAR(5), c6 INT DEFAULT '1', @@ -822,7 +822,7 @@ sync_slave_with_master; --echo *** Create t16 on slave *** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc eval CREATE TABLE t16 (c1 INT KEY, c2 DECIMAL(8,2), c3 TEXT, c4 BLOB, c5 CHAR(5), c6 INT DEFAULT '1', @@ -877,7 +877,7 @@ sync_slave_with_master; --echo *** Create t17 on slave *** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc eval CREATE TABLE t17 (a SMALLINT, b INT PRIMARY KEY, c CHAR(5), d FLOAT DEFAULT '2.00', e CHAR(5) DEFAULT 'TEST2') diff --git a/mysql-test/suite/rpl/include/rpl_flsh_tbls.test b/mysql-test/suite/rpl/include/rpl_flsh_tbls.test index a8cec3d2a1a..491897ae1e5 100644 --- a/mysql-test/suite/rpl/include/rpl_flsh_tbls.test +++ b/mysql-test/suite/rpl/include/rpl_flsh_tbls.test @@ -6,6 +6,12 @@ source include/master-slave.inc; +connection slave; +source include/stop_slave.inc; +change master to master_use_gtid=no; +source include/start_slave.inc; +connection master; + let $SERVER_VERSION=`select version()`; create table t1 (a int) ENGINE=MyISAM; diff --git a/mysql-test/suite/rpl/include/rpl_innodb_rows_counters.inc b/mysql-test/suite/rpl/include/rpl_innodb_rows_counters.inc deleted file mode 100644 index cb51058f0ae..00000000000 --- a/mysql-test/suite/rpl/include/rpl_innodb_rows_counters.inc +++ /dev/null @@ -1,48 +0,0 @@ -######################################### -# Author: Benjamin Renard benj@fb.com -# Date: 11/15/2013 -# Purpose: Showing the difference between current innodb rows stats and the ones recorded at the beginning of the test -# Requirements: Having @[master|slave]_[system_]rows_[read|inserted|deleted|updated] counters already created -######################################### - ---connection master - -select variable_value into @rows_read from information_schema.global_status where variable_name = 'innodb_rows_read'; -select @rows_read - @master_rows_read; -select variable_value into @rows_updated from information_schema.global_status where variable_name = 'innodb_rows_updated'; -select @rows_updated - @master_rows_updated; -select variable_value into @rows_deleted from information_schema.global_status where variable_name = 'innodb_rows_deleted'; -select @rows_deleted - @master_rows_deleted; -select variable_value into @rows_inserted from information_schema.global_status where variable_name = 'innodb_rows_inserted'; -select @rows_inserted - @master_rows_inserted; - -select variable_value into @system_rows_read from information_schema.global_status where variable_name = 'innodb_system_rows_read'; -select @system_rows_read - @master_system_rows_read; -select variable_value into @system_rows_updated from information_schema.global_status where variable_name = 'innodb_system_rows_updated'; -select @system_rows_updated - @master_system_rows_updated; -select variable_value into @system_rows_deleted from information_schema.global_status where variable_name = 'innodb_system_rows_deleted'; -select @system_rows_deleted - @master_system_rows_deleted; -select variable_value into @system_rows_inserted from information_schema.global_status where variable_name = 'innodb_system_rows_inserted'; -select @system_rows_inserted - @master_system_rows_inserted; - ---sync_slave_with_master - -select variable_value into @rows_read from information_schema.global_status where variable_name = 'innodb_rows_read'; -select @rows_read - @slave_rows_read; -select variable_value into @rows_updated from information_schema.global_status where variable_name = 'innodb_rows_updated'; -select @rows_updated - @slave_rows_updated; -select variable_value into @rows_deleted from information_schema.global_status where variable_name = 'innodb_rows_deleted'; -select @rows_deleted - @slave_rows_deleted; -select variable_value into @rows_inserted from information_schema.global_status where variable_name = 'innodb_rows_inserted'; -select @rows_inserted - @slave_rows_inserted; - -select variable_value into @system_rows_read from information_schema.global_status where variable_name = 'innodb_system_rows_read'; -select @system_rows_read - @slave_system_rows_read; -select variable_value into @system_rows_updated from information_schema.global_status where variable_name = 'innodb_system_rows_updated'; -select @system_rows_updated - @slave_system_rows_updated; -select variable_value into @system_rows_deleted from information_schema.global_status where variable_name = 'innodb_system_rows_deleted'; -select @system_rows_deleted - @slave_system_rows_deleted; -select variable_value into @system_rows_inserted from information_schema.global_status where variable_name = 'innodb_system_rows_inserted'; -select @system_rows_inserted - @slave_system_rows_inserted; - ---connection master diff --git a/mysql-test/suite/rpl/include/rpl_loaddata.test b/mysql-test/suite/rpl/include/rpl_loaddata.test index f0933c1023f..0a6d03aa837 100644 --- a/mysql-test/suite/rpl/include/rpl_loaddata.test +++ b/mysql-test/suite/rpl/include/rpl_loaddata.test @@ -109,7 +109,7 @@ connection slave; # RESET SLAVE and see if error is cleared in SHOW SLAVE STATUS. stop slave; -reset slave; +--source include/reset_slave.inc --source include/check_slave_no_error.inc # Finally, see if logging is done ok on master for a failing LOAD DATA INFILE diff --git a/mysql-test/suite/rpl/include/rpl_parallel_29322.inc b/mysql-test/suite/rpl/include/rpl_parallel_29322.inc index 54eb13d7f09..96d75f33fb0 100644 --- a/mysql-test/suite/rpl/include/rpl_parallel_29322.inc +++ b/mysql-test/suite/rpl/include/rpl_parallel_29322.inc @@ -19,7 +19,8 @@ --connection slave --source include/stop_slave.inc -reset slave; +--let $master_use_gtid_option=No +--source include/reset_slave.inc --connection master --let $datadir= `SELECT @@datadir` diff --git a/mysql-test/suite/rpl/include/rpl_reset_slave.test b/mysql-test/suite/rpl/include/rpl_reset_slave.test index e7a78f36efc..d4c9d70169b 100644 --- a/mysql-test/suite/rpl/include/rpl_reset_slave.test +++ b/mysql-test/suite/rpl/include/rpl_reset_slave.test @@ -11,7 +11,9 @@ -- source include/master-slave.inc sync_slave_with_master; --disable_query_log +set sql_log_bin=0; call mtr.add_suppression('Slave I/O: Get master BINLOG_CHECKSUM failed with error'); +set sql_log_bin=1; --enable_query_log let $status_items= Master_User, Master_Host; source include/show_slave_status.inc; @@ -20,7 +22,7 @@ source include/stop_slave.inc; change master to master_user='test'; source include/show_slave_status.inc; -reset slave; +--source include/reset_slave.inc source include/show_slave_status.inc; change master to master_user='root'; @@ -31,13 +33,13 @@ source include/show_slave_status.inc; # test of crash with temp tables & RESET SLAVE # (test to see if RESET SLAVE clears temp tables in memory and disk) source include/stop_slave.inc; -reset slave; +--source include/reset_slave.inc source include/start_slave.inc; connection master; create temporary table t1 (a int); sync_slave_with_master; source include/stop_slave.inc; -reset slave; +--source include/reset_slave.inc source include/start_slave.inc; sync_with_master; show status like 'slave_open_temp_tables'; @@ -51,7 +53,7 @@ sync_slave_with_master; # clearing the status source include/stop_slave.inc; -reset slave; +--source include/reset_slave.inc source include/check_slave_no_error.inc; # @@ -79,7 +81,7 @@ let $slave_io_errno= 1045; --source include/wait_for_slave_io_error.inc --source include/stop_slave_sql.inc -reset slave; +--source include/reset_slave.inc source include/check_slave_no_error.inc; change master to master_user='root'; @@ -88,7 +90,7 @@ change master to master_user='root'; # BUG#11809016 - NO WAY TO DISCOVER AN INSTANCE IS NO LONGER A SLAVE FOLLOWING MYSQL BUG#28796 # -reset slave; +--source include/reset_slave.inc --source include/start_slave.inc --source include/stop_slave.inc @@ -97,6 +99,7 @@ reset slave; --let $_slave_master_port= query_get_value(SHOW SLAVE STATUS, Master_Port, 1) reset slave all; +set @@global.gtid_slave_pos= ""; --error ER_BAD_SLAVE start slave; diff --git a/mysql-test/suite/rpl/include/rpl_semi_sync.inc b/mysql-test/suite/rpl/include/rpl_semi_sync.inc index c3cd918b5fc..720ec059350 100644 --- a/mysql-test/suite/rpl/include/rpl_semi_sync.inc +++ b/mysql-test/suite/rpl/include/rpl_semi_sync.inc @@ -17,9 +17,16 @@ call mtr.add_suppression("Read semi-sync reply"); call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT."); call mtr.add_suppression("mysqld: Got an error reading communication packets"); connection slave; +# While 'Current_Pos' exists as an option for Using_Gtd, keeping these +# events in the binlog will update gtid_binlog_pos, and the later calls to +# set `@@global.gtid_slave_pos= ""` will provide warning messages with +# inconsistent GTID values because the seq_nos are non-deterministic with +# the masters events coming in concurrently +set sql_log_bin=0; call mtr.add_suppression("Master server does not support semi-sync"); call mtr.add_suppression("Semi-sync slave .* reply"); call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group"); +set sql_log_bin=1; connection master; # wait for dying connections (if any) to disappear @@ -36,7 +43,7 @@ let $_connections_normal_slave= query_get_value(SHOW STATUS LIKE 'Threads_connec --echo # connection slave; source include/stop_slave.inc; -reset slave; +--source include/reset_slave.inc set global rpl_semi_sync_master_enabled= 0; set global rpl_semi_sync_slave_enabled= 0; @@ -351,7 +358,7 @@ show status like 'Rpl_semi_sync_master_yes_tx'; connection slave; source include/stop_slave.inc; -reset slave; +--source include/reset_slave.inc # Kill the dump thread on master for previous slave connection and --source include/kill_binlog_dump_threads.inc @@ -388,7 +395,7 @@ show status like 'Rpl_semi_sync_master_yes_tx'; --echo # connection slave; source include/stop_slave.inc; -reset slave; +--source include/reset_slave.inc connection master; reset master; diff --git a/mysql-test/suite/rpl/include/rpl_skip_replication.inc b/mysql-test/suite/rpl/include/rpl_skip_replication.inc index 97fc961d438..d1044c4bf51 100644 --- a/mysql-test/suite/rpl/include/rpl_skip_replication.inc +++ b/mysql-test/suite/rpl/include/rpl_skip_replication.inc @@ -19,6 +19,12 @@ --source include/have_innodb.inc --source include/master-slave.inc +--connection slave +--source include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +--source include/start_slave.inc +--connection master + connection slave; # Test that SUPER is required to change @@replicate_events_marked_for_skip. CREATE USER 'nonsuperuser'@'127.0.0.1'; diff --git a/mysql-test/suite/rpl/include/rpl_slave_max_statement_time.inc b/mysql-test/suite/rpl/include/rpl_slave_max_statement_time.inc new file mode 100644 index 00000000000..e064fb074dc --- /dev/null +++ b/mysql-test/suite/rpl/include/rpl_slave_max_statement_time.inc @@ -0,0 +1,79 @@ +# +# Helper test file to ensure that an event running on a slave which executes +# for longer than @@slave_max_statement_time will time out. By default, it will +# use the sleep function to imitate a long running function. This can be +# changed to use locks using the parameter with_lock. +# +# Parameters: +# with_lock (boolean, in) : Changes the long running command from using SLEEP +# to using locks. In particular, the MTR test will take the table level +# write lock on the slave side, while the slave concurrently tries to +# execute an insert statement. +# +# use_load_data (boolean, in) : If in row logging format, uses LOAD DATA +# INFILLE command to create Load_log_events to create the events which +# should time out +# + +--connection master +create table t1(a int not null auto_increment, b int, primary key(a)) engine=InnoDB; +--source include/save_master_gtid.inc + +--connection slave +--source include/sync_with_master_gtid.inc +--source include/stop_slave.inc +SET @old_slave_max_statement_time=@@GLOBAL.slave_max_statement_time; +SET GLOBAL slave_max_statement_time=0.75; + +--connection master +--echo # Long running command due to a lock conflict +if (!$use_load_data) +{ + INSERT INTO t1(b) VALUES (1); +} +if ($use_load_data) +{ + load data infile '../../std_data/rpl_loaddata.dat' into table t1; +} +--source include/save_master_gtid.inc + +--connection slave1 + BEGIN; INSERT INTO t1(b) VALUES (1); + +--connection slave + +--echo # Starting slave to receive event which will take longer to execute +--echo # than slave_max_statement_time +START SLAVE; + +# ER_SLAVE_STATEMENT_TIMEOUT +--let $slave_sql_errno= 4192 +--source include/wait_for_slave_sql_error.inc + +--echo # Ensuring event was not processed.. +--let $t1_count= `select count(*) from t1` +if ($t1_count != 0) +{ + --die Event should have timed out on the slave and not been executed +} +--echo # ..success + +--echo # Remove slave timeout and catch up to master +SET GLOBAL slave_max_statement_time=0; + +--connection slave1 + ROLLBACK; + +--source include/start_slave.inc +--source include/sync_with_master_gtid.inc + +--echo # Test case cleanup +--connection master +DROP TABLE t1; +--source include/save_master_gtid.inc + +--connection slave +--source include/sync_with_master_gtid.inc +--source include/stop_slave.inc +SET GLOBAL slave_max_statement_time=@old_slave_max_statement_time; +--source include/start_slave.inc diff --git a/mysql-test/suite/rpl/include/rpl_start_stop_slave.test b/mysql-test/suite/rpl/include/rpl_start_stop_slave.test index 32f33b2a31d..ae5f83613fe 100644 --- a/mysql-test/suite/rpl/include/rpl_start_stop_slave.test +++ b/mysql-test/suite/rpl/include/rpl_start_stop_slave.test @@ -195,7 +195,7 @@ let $master_pos= `SELECT $master_pos + 1`; --connection slave --source include/stop_slave.inc --replace_regex /[0-9]+/MASTER_POS/ -eval CHANGE MASTER TO master_log_pos=$master_pos; +eval CHANGE MASTER TO master_log_pos=$master_pos, master_use_gtid=no; START SLAVE; # ER_MASTER_FATAL_ERROR_READING_BINLOG 1236 diff --git a/mysql-test/suite/rpl/r/rpl_000010.result b/mysql-test/suite/rpl/r/rpl_000010.result index ae989f25e1b..a86d71bd33f 100644 --- a/mysql-test/suite/rpl/r/rpl_000010.result +++ b/mysql-test/suite/rpl/r/rpl_000010.result @@ -1,5 +1,10 @@ include/master-slave.inc [connection master] +connection slave; +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc +connection master; create table t1 (n int not null auto_increment primary key); insert into t1 values(NULL); insert into t1 values(2); diff --git a/mysql-test/suite/rpl/r/rpl_auto_increment_bug33029.result b/mysql-test/suite/rpl/r/rpl_auto_increment_bug33029.result index c75e65ebb6f..49f3ac455f1 100644 --- a/mysql-test/suite/rpl/r/rpl_auto_increment_bug33029.result +++ b/mysql-test/suite/rpl/r/rpl_auto_increment_bug33029.result @@ -38,6 +38,8 @@ id ==== Clean up ==== stop slave sql_thread; include/cleanup_fake_relay_log.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' DROP TABLE t1, t2; DROP PROCEDURE p1; DROP PROCEDURE p2; diff --git a/mysql-test/suite/rpl/r/rpl_binlog_corruption.result b/mysql-test/suite/rpl/r/rpl_binlog_corruption.result index 5c141eed596..730fb67ebc9 100644 --- a/mysql-test/suite/rpl/r/rpl_binlog_corruption.result +++ b/mysql-test/suite/rpl/r/rpl_binlog_corruption.result @@ -14,4 +14,6 @@ include/wait_for_slave_sql_error.inc [errno=1594] Last_SQL_Error = Relay log read failure: Could not parse relay log event entry. The possible reasons are: the master's binary log is corrupted (you can check this by running 'mysqlbinlog' on the binary log), the slave's relay log is corrupted (you can check this by running 'mysqlbinlog' on the relay log), a network problem, or a bug in the master's or slave's MariaDB code. If you want to check the master's binary log or slave's relay log, you will be able to know their names by issuing 'SHOW SLAVE STATUS' on this slave. ==== Clean up ==== include/cleanup_fake_relay_log.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_binlog_dump_slave_gtid_state_info.result b/mysql-test/suite/rpl/r/rpl_binlog_dump_slave_gtid_state_info.result index 98688df7273..b913a49b509 100644 --- a/mysql-test/suite/rpl/r/rpl_binlog_dump_slave_gtid_state_info.result +++ b/mysql-test/suite/rpl/r/rpl_binlog_dump_slave_gtid_state_info.result @@ -4,7 +4,7 @@ connection master; SET GLOBAL LOG_WARNINGS=2; connection slave; include/stop_slave.inc -CHANGE MASTER TO MASTER_USE_GTID=current_pos; +CHANGE MASTER TO MASTER_USE_GTID=slave_pos; include/start_slave.inc connection master; "Test Case 1: Start binlog_dump to slave_server(#), pos(master-bin.000001, ###), using_gtid(1), gtid('')" diff --git a/mysql-test/suite/rpl/r/rpl_binlog_errors.result b/mysql-test/suite/rpl/r/rpl_binlog_errors.result index 4c667bd7f5a..0c79b079bd6 100644 --- a/mysql-test/suite/rpl/r/rpl_binlog_errors.result +++ b/mysql-test/suite/rpl/r/rpl_binlog_errors.result @@ -232,6 +232,9 @@ connection master; ####################################################################### include/rpl_reset.inc connection slave; +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc call mtr.add_suppression("Slave I/O: Relay log write failure: could not queue event from master.*"); call mtr.add_suppression("Error writing file .*"); call mtr.add_suppression("Could not use .*"); @@ -277,5 +280,7 @@ include/stop_slave_sql.inc Warnings: Note 1255 Slave already has been stopped RESET SLAVE; +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' RESET MASTER; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_blackhole_row_annotate.result b/mysql-test/suite/rpl/r/rpl_blackhole_row_annotate.result index 53420891754..2c602ea53aa 100644 --- a/mysql-test/suite/rpl/r/rpl_blackhole_row_annotate.result +++ b/mysql-test/suite/rpl/r/rpl_blackhole_row_annotate.result @@ -200,7 +200,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result b/mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result index 5aff978538f..86659816f6c 100644 --- a/mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result +++ b/mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result @@ -2,6 +2,9 @@ include/master-slave.inc [connection master] connection slave; include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc +include/stop_slave.inc connection master; call mtr.add_suppression("Error in Log_event::read_log_event()"); include/rpl_stop_server.inc [server_number=1] @@ -10,7 +13,9 @@ show binlog events; ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error connection slave; call mtr.add_suppression("Slave I/O: Got fatal error 1236 from master when reading data from binary log"); -reset slave; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' start slave; include/wait_for_slave_param.inc [Last_IO_Errno] Last_IO_Errno = '1236' @@ -20,6 +25,8 @@ reset master; connection slave; stop slave; reset slave; +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' drop table if exists t; reset master; End of the tests diff --git a/mysql-test/suite/rpl/r/rpl_change_master.result b/mysql-test/suite/rpl/r/rpl_change_master.result index 48cec72d917..88801b07bba 100644 --- a/mysql-test/suite/rpl/r/rpl_change_master.result +++ b/mysql-test/suite/rpl/r/rpl_change_master.result @@ -26,4 +26,9 @@ connection master; CHANGE MASTER TO MASTER_USER='root', MASTER_SSL=0, MASTER_SSL_CA='', MASTER_SSL_CERT='', MASTER_SSL_KEY='', MASTER_SSL_CRL='', MASTER_SSL_CRLPATH=''; CHANGE MASTER TO MASTER_USER='root', MASTER_PASSWORD='', MASTER_SSL=0; +"Usage of CURRENT_POS in CHANGE MASTER MASTER_USE_GTID is dreprecated. +CHANGE MASTER TO MASTER_USE_GTID=CURRENT_POS; +Warnings: +Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead +CHANGE MASTER TO MASTER_USE_GTID=SLAVE_POS; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_change_master_demote.result b/mysql-test/suite/rpl/r/rpl_change_master_demote.result new file mode 100644 index 00000000000..38cff83829e --- /dev/null +++ b/mysql-test/suite/rpl/r/rpl_change_master_demote.result @@ -0,0 +1,687 @@ +include/master-slave.inc +[connection master] +connection slave; +include/stop_slave.inc +change master to master_use_gtid=slave_pos; +include/start_slave.inc +include/sync_with_master_gtid.inc +# +# Test Case 1: When both gtid_binlog_pos and gtid_slave_pos are +# empty, MASTER_DEMOTE_TO_SLAVE=1 results in no change to replication +# state. +# +include/rpl_change_master_demote.inc +############################################## +# Connection semantics change: +# * True primary is now connection 'slave' +# * True replica is now connection 'master' +############################################## +connection master; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS +GTID_CURRENT_POS +GTID_SLAVE_POS +# First ensure gtid_slave_pos after master_demote_to_slave matches +# gtid_current_pos calculation +CHANGE MASTER TO master_host='127.0.0.1', master_port=SLAVE_PORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1 ; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS +GTID_CURRENT_POS +GTID_SLAVE_POS +# Validating gtid_slave_pos == gtid_binlog_pos.. +# ..success +connection slave; +# Ensuring replication works correctly after role swap +connection slave; +set session gtid_domain_id= 0; +CREATE TABLE repl_t (a int); +INSERT INTO repl_t VALUES (1); +connection master; +# Validating that replication works.. +# ..success +# Cleaning up replication check data +connection slave; +DROP TABLE repl_t; +connection master; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS +GTID_CURRENT_POS 0-2-3 +GTID_SLAVE_POS 0-2-3 +############################################## +# Connection semantics change: +# * True primary is back to connection 'master' +# * True replica is back to connection 'slave' +############################################## +connection master; +connection slave; +CHANGE MASTER TO master_host='127.0.0.1', master_port=MASTER_PORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1; +# +# Test Case 2: If gtid_slave_pos is empty, gtid_binlog_pos will +# completely overwrite it with MASTER_DEMOTE_TO_SLAVE=1. +# +connection slave; +include/stop_slave.inc +RESET MASTER; +set @@global.gtid_slave_pos=""; +include/start_slave.inc +connection master; +RESET MASTER; +set @@global.gtid_slave_pos=""; +set session gtid_domain_id= 0; +CREATE TABLE t1 (a int); +INSERT INTO t1 VALUES (1); +include/save_master_gtid.inc +connection slave; +include/sync_with_master_gtid.inc +include/rpl_change_master_demote.inc +############################################## +# Connection semantics change: +# * True primary is now connection 'slave' +# * True replica is now connection 'master' +############################################## +connection master; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-2 +GTID_CURRENT_POS 0-1-2 +GTID_SLAVE_POS +# First ensure gtid_slave_pos after master_demote_to_slave matches +# gtid_current_pos calculation +CHANGE MASTER TO master_host='127.0.0.1', master_port=SLAVE_PORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1 ; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-2 +GTID_CURRENT_POS 0-1-2 +GTID_SLAVE_POS 0-1-2 +# Validating gtid_slave_pos == gtid_binlog_pos.. +# ..success +connection slave; +# Ensuring replication works correctly after role swap +connection slave; +set session gtid_domain_id= 0; +CREATE TABLE repl_t (a int); +INSERT INTO repl_t VALUES (1); +connection master; +# Validating that replication works.. +# ..success +# Cleaning up replication check data +connection slave; +DROP TABLE repl_t; +connection master; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-2 +GTID_CURRENT_POS 0-2-5 +GTID_SLAVE_POS 0-2-5 +############################################## +# Connection semantics change: +# * True primary is back to connection 'master' +# * True replica is back to connection 'slave' +############################################## +connection master; +connection slave; +CHANGE MASTER TO master_host='127.0.0.1', master_port=MASTER_PORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1; +# +# Test Case 3: Using a single domain id, if neither gtid_slave_pos nor +# gtid_binlog_pos are empty, and gtid_binlog_pos is more recent, then +# gtid_binlog_pos will overwrite gtid_slave_pos when +# MASTER_DEMOTE_TO_SLAVE=1. +# +connection master; +INSERT INTO t1 VALUES (2); +include/save_master_gtid.inc +connection slave; +include/sync_with_master_gtid.inc +include/rpl_change_master_demote.inc +############################################## +# Connection semantics change: +# * True primary is now connection 'slave' +# * True replica is now connection 'master' +############################################## +connection master; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-6 +GTID_CURRENT_POS 0-1-6 +GTID_SLAVE_POS 0-2-5 +# First ensure gtid_slave_pos after master_demote_to_slave matches +# gtid_current_pos calculation +CHANGE MASTER TO master_host='127.0.0.1', master_port=SLAVE_PORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1 ; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-6 +GTID_CURRENT_POS 0-1-6 +GTID_SLAVE_POS 0-1-6 +# Validating gtid_slave_pos == gtid_binlog_pos.. +# ..success +connection slave; +# Ensuring replication works correctly after role swap +connection slave; +set session gtid_domain_id= 0; +CREATE TABLE repl_t (a int); +INSERT INTO repl_t VALUES (1); +connection master; +# Validating that replication works.. +# ..success +# Cleaning up replication check data +connection slave; +DROP TABLE repl_t; +connection master; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-6 +GTID_CURRENT_POS 0-2-9 +GTID_SLAVE_POS 0-2-9 +############################################## +# Connection semantics change: +# * True primary is back to connection 'master' +# * True replica is back to connection 'slave' +############################################## +connection master; +connection slave; +CHANGE MASTER TO master_host='127.0.0.1', master_port=MASTER_PORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1; +# +# Test Case 4: If gtid_slave_pos and gtid_binlog_pos are equivalent, +# MASTER_DEMOTE_TO_SLAVE=1 will not change gtid_slave_pos. +# +connection master; +# update gtid_binlog_pos and demote it (we have proven this works) +INSERT INTO t1 VALUES (3); +# Update to account for statements to verify replication in include file +CHANGE MASTER TO master_host='127.0.0.1', master_port=SLAVE_PORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1; +RESET SLAVE ALL; +include/save_master_gtid.inc +connection slave; +include/sync_with_master_gtid.inc +include/rpl_change_master_demote.inc +############################################## +# Connection semantics change: +# * True primary is now connection 'slave' +# * True replica is now connection 'master' +############################################## +connection master; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-10 +GTID_CURRENT_POS 0-1-10 +GTID_SLAVE_POS 0-1-10 +# First ensure gtid_slave_pos after master_demote_to_slave matches +# gtid_current_pos calculation +CHANGE MASTER TO master_host='127.0.0.1', master_port=SLAVE_PORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1 ; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-10 +GTID_CURRENT_POS 0-1-10 +GTID_SLAVE_POS 0-1-10 +# Validating gtid_slave_pos == gtid_binlog_pos.. +# ..success +connection slave; +# Ensuring replication works correctly after role swap +connection slave; +set session gtid_domain_id= 0; +CREATE TABLE repl_t (a int); +INSERT INTO repl_t VALUES (1); +connection master; +# Validating that replication works.. +# ..success +# Cleaning up replication check data +connection slave; +DROP TABLE repl_t; +connection master; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-10 +GTID_CURRENT_POS 0-2-13 +GTID_SLAVE_POS 0-2-13 +############################################## +# Connection semantics change: +# * True primary is back to connection 'master' +# * True replica is back to connection 'slave' +############################################## +connection master; +connection slave; +CHANGE MASTER TO master_host='127.0.0.1', master_port=MASTER_PORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1; +# +# Test Case 5: If a new domain id is added into gtid_binlog_pos while +# gtid_slave_pos already has a state, MASTER_DEMOTE_TO_SLAVE=1 will +# append a new GTID to gtid_slave_pos with the latest seq_no from that +# domain. +# +connection master; +# Domain_id +set session gtid_domain_id= 0; +INSERT INTO t1 VALUES (4); +set session gtid_domain_id= 1; +CREATE TABLE t2 (a int); +INSERT INTO t2 VALUES (1); +include/save_master_gtid.inc +connection slave; +include/sync_with_master_gtid.inc +include/rpl_change_master_demote.inc +############################################## +# Connection semantics change: +# * True primary is now connection 'slave' +# * True replica is now connection 'master' +############################################## +connection master; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-14,1-1-2 +GTID_CURRENT_POS 0-1-14,1-1-2 +GTID_SLAVE_POS 0-2-13 +# First ensure gtid_slave_pos after master_demote_to_slave matches +# gtid_current_pos calculation +CHANGE MASTER TO master_host='127.0.0.1', master_port=SLAVE_PORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1 ; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-14,1-1-2 +GTID_CURRENT_POS 0-1-14,1-1-2 +GTID_SLAVE_POS 0-1-14,1-1-2 +# Validating gtid_slave_pos == gtid_binlog_pos.. +# ..success +connection slave; +# Ensuring replication works correctly after role swap +connection slave; +set session gtid_domain_id= 0; +CREATE TABLE repl_t (a int); +INSERT INTO repl_t VALUES (1); +connection master; +# Validating that replication works.. +# ..success +# Cleaning up replication check data +connection slave; +DROP TABLE repl_t; +connection master; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-14,1-1-2 +GTID_CURRENT_POS 0-2-17,1-1-2 +GTID_SLAVE_POS 0-2-17,1-1-2 +############################################## +# Connection semantics change: +# * True primary is back to connection 'master' +# * True replica is back to connection 'slave' +############################################## +connection master; +connection slave; +CHANGE MASTER TO master_host='127.0.0.1', master_port=MASTER_PORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1; +# +# Test Case 6: If gtid_slave_pos has multiple GTID positions and +# gtid_binlog_pos contains updates on existing domain ids, new +# domains, and differing server_ids, MASTER_DEMOTE_TO_SLAVE=1 will +# update gtid_slave_pos such that it will have the seq_nos only from +# the GTIDs last applied by this server. In other words, any GTIDs +# with server ids that don't match that of the demoting server will be +# ignored in the update. +# +connection master; +# Update to account for statements to verify replication in include file +set session gtid_domain_id= 0; +INSERT INTO t1 VALUES (5); +CHANGE MASTER TO master_host='127.0.0.1', master_port=SLAVE_PORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1; +RESET SLAVE ALL; +set session gtid_domain_id= 1; +INSERT INTO t2 VALUES (2); +set session gtid_domain_id= 2; +CREATE TABLE t3 (a int); +INSERT INTO t3 VALUES (1); +# The following events have a different server_id and should not go into +# gtid_slave_pos +set @old_server_id = @@server_id; +set session gtid_domain_id= 1; +set session server_id= 3; +INSERT INTO t2 VALUES (3); +set session gtid_domain_id= 4; +set session server_id= 3; +CREATE TABLE t5 (a int); +INSERT INTO t5 VALUES (1); +set session server_id= @old_server_id; +include/save_master_gtid.inc +connection slave; +include/sync_with_master_gtid.inc +include/rpl_change_master_demote.inc +############################################## +# Connection semantics change: +# * True primary is now connection 'slave' +# * True replica is now connection 'master' +############################################## +connection master; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-18,1-3-4,2-1-2,4-3-2 +GTID_CURRENT_POS 0-1-18,1-1-2,2-1-2 +GTID_SLAVE_POS 0-1-18,1-1-2 +# First ensure gtid_slave_pos after master_demote_to_slave matches +# gtid_current_pos calculation +CHANGE MASTER TO master_host='127.0.0.1', master_port=SLAVE_PORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1 ; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-18,1-3-4,2-1-2,4-3-2 +GTID_CURRENT_POS 0-1-18,1-1-2,2-1-2 +GTID_SLAVE_POS 0-1-18,1-1-2,2-1-2 +# Validating gtid_slave_pos == gtid_binlog_pos.. +# ..success +connection slave; +# Ensuring replication works correctly after role swap +connection slave; +set session gtid_domain_id= 0; +CREATE TABLE repl_t (a int); +INSERT INTO repl_t VALUES (1); +connection master; +# Validating that replication works.. +# ..success +# Cleaning up replication check data +connection slave; +DROP TABLE repl_t; +connection master; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-18,1-3-4,2-1-2,4-3-2 +GTID_CURRENT_POS 0-2-21,1-3-4,2-1-2,4-3-2 +GTID_SLAVE_POS 0-2-21,1-3-4,2-1-2,4-3-2 +############################################## +# Connection semantics change: +# * True primary is back to connection 'master' +# * True replica is back to connection 'slave' +############################################## +connection master; +connection slave; +CHANGE MASTER TO master_host='127.0.0.1', master_port=MASTER_PORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1; +# +# Test Case 7: If MASTER_DEMOTE_TO_SLAVE=1 is combined with +# IGNORE_DOMAIN_IDS such that gtid_binlog_pos has more recent GTIDs +# than gtid_slave_pos in ignored domains, the CHANGE MASTER TO command +# will still update gtid_slave_pos with the most recent transactions +# from gtid_binlog_pos, despite being ignored by CHANGE MASTER TO +# because they were already applied on the server. +# +connection master; +set session gtid_domain_id= 2; +INSERT INTO t3 VALUES (2); +set session gtid_domain_id= 3; +CREATE TABLE t4 (a int); +INSERT INTO t4 VALUES (1); +include/save_master_gtid.inc +connection slave; +include/sync_with_master_gtid.inc +include/rpl_change_master_demote.inc +############################################## +# Connection semantics change: +# * True primary is now connection 'slave' +# * True replica is now connection 'master' +############################################## +connection master; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-18,1-3-4,2-1-3,3-1-2,4-3-2 +GTID_CURRENT_POS 0-2-21,1-3-4,2-1-3,3-1-2,4-3-2 +GTID_SLAVE_POS 0-2-21,1-3-4,2-1-2,4-3-2 +# First ensure gtid_slave_pos after master_demote_to_slave matches +# gtid_current_pos calculation +CHANGE MASTER TO master_host='127.0.0.1', master_port=SLAVE_PORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1 , ignore_domain_ids=(2,3); +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-18,1-3-4,2-1-3,3-1-2,4-3-2 +GTID_CURRENT_POS 0-2-21,1-3-4,2-1-3,3-1-2,4-3-2 +GTID_SLAVE_POS 0-2-21,1-3-4,2-1-3,3-1-2,4-3-2 +# Validating gtid_slave_pos == gtid_binlog_pos.. +# ..success +connection slave; +# Ensuring replication works correctly after role swap +connection slave; +set session gtid_domain_id= 0; +CREATE TABLE repl_t (a int); +INSERT INTO repl_t VALUES (1); +connection master; +# Validating that replication works.. +# ..success +# Cleaning up replication check data +connection slave; +DROP TABLE repl_t; +connection master; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-18,1-3-4,2-1-3,3-1-2,4-3-2 +GTID_CURRENT_POS 0-2-24,1-3-4,2-1-3,3-1-2,4-3-2 +GTID_SLAVE_POS 0-2-24,1-3-4,2-1-3,3-1-2,4-3-2 +############################################## +# Connection semantics change: +# * True primary is back to connection 'master' +# * True replica is back to connection 'slave' +############################################## +connection master; +connection slave; +CHANGE MASTER TO master_host='127.0.0.1', master_port=MASTER_PORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1; +# +# Test Case 8: If gtid_binlog_pos is more recent than gtid_slave_pos, +# and MASTER_DEMOTE_TO_SLAVE=1 is combined with a later call to +# START SLAVE UNTIL master_gtid_pos=<G> such that +# gtid_slave_pos < G < gtid_binlog_pos, then the slave should stop +# immediately after SSU because gtid_slave_pos should be updated to be +# after G. +# +connection master; +set session gtid_domain_id= 0; +INSERT INTO t1 VALUES (6); +# Tagging ssu_middle_binlog_pos here to be used for START SLAVE UNTIL +INSERT INTO t1 VALUES (7); +include/save_master_gtid.inc +# Ensure slave is up-to-date with master and then disable slave status +connection slave; +include/sync_with_master_gtid.inc +include/stop_slave.inc +connection master; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-26,1-3-4,2-1-3,3-1-2,4-3-2 +GTID_SLAVE_POS 0-2-24,1-3-4,2-1-3,3-1-2,4-3-2 +CHANGE MASTER TO master_host='127.0.0.1', master_port=SLAVE_PORT, master_user='root', master_use_gtid=Slave_Pos, master_demote_to_slave=1; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-26,1-3-4,2-1-3,3-1-2,4-3-2 +GTID_SLAVE_POS 0-1-26,1-3-4,2-1-3,3-1-2,4-3-2 +# GTID ssu_middle_binlog_pos should be considered in the past because +# gtid_slave_pos should be updated using the latest binlog gtids. +# The following call to sync_with_master_gtid.inc uses the latest +# binlog position and should still succeed despite the SSU stop +# position pointing to a previous event (because +# master_demote_to_slave=1 merges gtid_binlog_pos into gtid_slave_pos). +START SLAVE UNTIL master_gtid_pos="ssu_middle_binlog_pos"; +Warnings: +Note 1278 It is recommended to use --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL; otherwise, you will get problems if you get an unexpected slave's mariadbd restart +# Slave needs time to start and stop automatically +# Validating neither SQL nor IO threads are running.. +# ..success +# Clean slave state of master +RESET SLAVE ALL; +# +# Test Case 9: If gtid_slave_pos is more recent than gtid_binlog_pos +# when demoting the master to become a slave, the replication state +# should be preserved. +# +# rpl_change_master_demote.inc should force +# gtid_slave_pos > gtid_binlog_pos in domain 0 (due to the step which +# validates replication works) +connection master; +include/rpl_change_master_demote.inc +############################################## +# Connection semantics change: +# * True primary is now connection 'slave' +# * True replica is now connection 'master' +############################################## +connection master; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-26,1-3-4,2-1-3,3-1-2,4-3-2 +GTID_CURRENT_POS 0-1-26,1-3-4,2-1-3,3-1-2,4-3-2 +GTID_SLAVE_POS 0-1-26,1-3-4,2-1-3,3-1-2,4-3-2 +# First ensure gtid_slave_pos after master_demote_to_slave matches +# gtid_current_pos calculation +CHANGE MASTER TO master_host='127.0.0.1', master_port=SLAVE_PORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1 , ignore_domain_ids=(2,3); +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-26,1-3-4,2-1-3,3-1-2,4-3-2 +GTID_CURRENT_POS 0-1-26,1-3-4,2-1-3,3-1-2,4-3-2 +GTID_SLAVE_POS 0-1-26,1-3-4,2-1-3,3-1-2,4-3-2 +# Validating gtid_slave_pos == gtid_binlog_pos.. +# ..success +connection slave; +Warnings: +Note 1255 Slave already has been stopped +# Ensuring replication works correctly after role swap +connection slave; +set session gtid_domain_id= 0; +CREATE TABLE repl_t (a int); +INSERT INTO repl_t VALUES (1); +connection master; +# Validating that replication works.. +# ..success +# Cleaning up replication check data +connection slave; +DROP TABLE repl_t; +connection master; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-26,1-3-4,2-1-3,3-1-2,4-3-2 +GTID_CURRENT_POS 0-2-29,1-3-4,2-1-3,3-1-2,4-3-2 +GTID_SLAVE_POS 0-2-29,1-3-4,2-1-3,3-1-2,4-3-2 +############################################## +# Connection semantics change: +# * True primary is back to connection 'master' +# * True replica is back to connection 'slave' +############################################## +connection master; +connection slave; +CHANGE MASTER TO master_host='127.0.0.1', master_port=MASTER_PORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1; +# Demote master to slave with the more recent gtid_slave_pos +connection master; +CHANGE MASTER TO master_host='127.0.0.1', master_port=SLAVE_PORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1; +# Validating gtid_slave_pos is unchanged.. +# ..success +# Validating gtid_slave_pos == gtid_binlog_pos.. +# ..success +# Clean slave state of master +RESET SLAVE ALL; +# +# Test Case 10: MASTER_DEMOTE_TO_SLAVE=0 should not change replication +# state, regardless of gtid_slave_pos in comparison to gtid_binlog_pos. +# +# In domain 0, make gtid_slave_pos > gtid_binlog_pos +connection master; +include/rpl_change_master_demote.inc +############################################## +# Connection semantics change: +# * True primary is now connection 'slave' +# * True replica is now connection 'master' +############################################## +connection master; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-26,1-3-4,2-1-3,3-1-2,4-3-2 +GTID_CURRENT_POS 0-2-29,1-3-4,2-1-3,3-1-2,4-3-2 +GTID_SLAVE_POS 0-2-29,1-3-4,2-1-3,3-1-2,4-3-2 +# First ensure gtid_slave_pos after master_demote_to_slave matches +# gtid_current_pos calculation +CHANGE MASTER TO master_host='127.0.0.1', master_port=SLAVE_PORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1 , ignore_domain_ids=(2,3); +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-26,1-3-4,2-1-3,3-1-2,4-3-2 +GTID_CURRENT_POS 0-2-29,1-3-4,2-1-3,3-1-2,4-3-2 +GTID_SLAVE_POS 0-2-29,1-3-4,2-1-3,3-1-2,4-3-2 +# Validating gtid_slave_pos == gtid_binlog_pos.. +# ..success +connection slave; +# Ensuring replication works correctly after role swap +connection slave; +set session gtid_domain_id= 0; +CREATE TABLE repl_t (a int); +INSERT INTO repl_t VALUES (1); +connection master; +# Validating that replication works.. +# ..success +# Cleaning up replication check data +connection slave; +DROP TABLE repl_t; +connection master; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-26,1-3-4,2-1-3,3-1-2,4-3-2 +GTID_CURRENT_POS 0-2-32,1-3-4,2-1-3,3-1-2,4-3-2 +GTID_SLAVE_POS 0-2-32,1-3-4,2-1-3,3-1-2,4-3-2 +############################################## +# Connection semantics change: +# * True primary is back to connection 'master' +# * True replica is back to connection 'slave' +############################################## +connection master; +connection slave; +CHANGE MASTER TO master_host='127.0.0.1', master_port=MASTER_PORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1; +# Tag gtid_slave_pos now (before binlog updates) for later comparison +connection master; +# In domain 1, make gtid_slave_pos < gtid_binlog_pos +set session gtid_domain_id= 1; +INSERT INTO t2 VALUES (4); +# In domains 2, 3 and 4, gtid_slave_pos == gtid_binlog_pos +# Include a new domain id (5) +set session gtid_domain_id= 5; +CREATE TABLE t6 (a int); +INSERT INTO t6 VALUES (1); +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-26,1-1-5,2-1-3,3-1-2,4-3-2,5-1-2 +GTID_SLAVE_POS 0-2-32,1-3-4,2-1-3,3-1-2,4-3-2 +CHANGE MASTER TO master_host='127.0.0.1', master_port=SLAVE_PORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=0; +# Validating gtid_slave_pos is unchanged.. +# ..success +# Clean slave state of master +CHANGE MASTER TO master_host='127.0.0.1', master_port=SLAVE_PORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1; +RESET SLAVE ALL; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' ORDER BY VARIABLE_NAME ASC; +VARIABLE_NAME GLOBAL_VALUE +GTID_BINLOG_POS 0-1-26,1-1-5,2-1-3,3-1-2,4-3-2,5-1-2 +GTID_SLAVE_POS 0-2-32,1-1-5,2-1-3,3-1-2,4-3-2,5-1-2 +# +# +# Stop slave for error test cases +connection slave; +include/stop_slave.inc +# +# Error Case 1: MASTER_DEMOTE_TO_SLAVE=1 combined with +# MASTER_USE_GTID=NO should result in an error. +# +connection master; +CHANGE MASTER TO master_host='127.0.0.1', master_port=SLAVE_PORT, master_user='root', master_use_gtid=no, master_demote_to_slave=1; +ERROR HY000: CHANGE MASTER TO option 'MASTER_DEMOTE_TO_SLAVE=TRUE' is missing requirement Using_Gtid=Slave_Pos +# +# Error Case 2: Error when MASTER_DEMOTE_TO_SLAVE=1 is used without +# binary logging enabled. +# +connection master; +# Restarting master without binary log +CHANGE MASTER TO master_host='127.0.0.1', master_port=SLAVE_PORT, master_user='root', master_use_gtid=Slave_Pos, master_demote_to_slave=1; +ERROR HY000: You are not using binary logging +# Restarting master to re-enable binary log +connection server_1; +connection default; +# +# Error Case 3: Error when MASTER_DEMOTE_TO_SLAVE is provided a +# non-boolean value. +# +connection master; +CHANGE MASTER TO master_host='127.0.0.1', master_port=SLAVE_PORT, master_user='root', master_use_gtid=Slave_Pos, master_demote_to_slave=invalid; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'invalid' at line 1 +# +# Cleanup +# +connection master; +DROP TABLE t1, t2, t3, t4, t5, t6; +include/save_master_gtid.inc +connection slave; +include/start_slave.inc +include/sync_with_master_gtid.inc +include/rpl_end.inc +# +### End rpl_change_master_demote.test diff --git a/mysql-test/suite/rpl/r/rpl_checksum.result b/mysql-test/suite/rpl/r/rpl_checksum.result index 21d8ca22feb..7ade3067eae 100644 --- a/mysql-test/suite/rpl/r/rpl_checksum.result +++ b/mysql-test/suite/rpl/r/rpl_checksum.result @@ -1,5 +1,10 @@ include/master-slave.inc [connection master] +connection slave; +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc +connection master; call mtr.add_suppression('Slave can not handle replication events with the checksum that master is configured to log'); call mtr.add_suppression('Replication event checksum verification failed'); call mtr.add_suppression('Relay log write failure: could not queue event from master'); @@ -122,7 +127,9 @@ must be zero 0 connection slave; stop slave; -reset slave; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' set @@global.binlog_checksum= IF(floor((rand()*1000)%2), "CRC32", "NONE"); flush logs; connection master; diff --git a/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result b/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result index 4ec1e2512d2..85cc0cc7ebc 100644 --- a/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result +++ b/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result @@ -184,6 +184,8 @@ connection server_3; RESET MASTER; connection server_4; RESET SLAVE; +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' include/rpl_change_topology.inc [new topology=1->2->3->4->1] include/start_slave.inc connection server_3; diff --git a/mysql-test/suite/rpl/r/rpl_colSize.result b/mysql-test/suite/rpl/r/rpl_colSize.result index 5d72ddcec09..95a30c6ee4d 100644 --- a/mysql-test/suite/rpl/r/rpl_colSize.result +++ b/mysql-test/suite/rpl/r/rpl_colSize.result @@ -6,7 +6,7 @@ DROP TABLE IF EXISTS t1; connection slave; STOP SLAVE; include/wait_for_slave_to_stop.inc -RESET SLAVE; +include/reset_slave.inc SET @saved_slave_type_conversions = @@slave_type_conversions; SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_NON_LOSSY'; CREATE TABLE t1 ( diff --git a/mysql-test/suite/rpl/r/rpl_corruption.result b/mysql-test/suite/rpl/r/rpl_corruption.result index 73bb373d6be..7c60e15a567 100644 --- a/mysql-test/suite/rpl/r/rpl_corruption.result +++ b/mysql-test/suite/rpl/r/rpl_corruption.result @@ -1,5 +1,10 @@ include/master-slave.inc [connection master] +connection slave; +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc +connection master; call mtr.add_suppression('Found invalid event in binary log'); call mtr.add_suppression('Slave I/O: Relay log write failure: could not queue event from master'); call mtr.add_suppression('event read from binlog did not pass crc check'); diff --git a/mysql-test/suite/rpl/r/rpl_cross_version.result b/mysql-test/suite/rpl/r/rpl_cross_version.result index b94b02a24ff..1b67542c106 100644 --- a/mysql-test/suite/rpl/r/rpl_cross_version.result +++ b/mysql-test/suite/rpl/r/rpl_cross_version.result @@ -16,5 +16,7 @@ zero ==== Clean up ==== include/stop_slave_sql.inc include/cleanup_fake_relay_log.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' drop table t1, t3; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result b/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result index 491b27252b4..16b00cee123 100644 --- a/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result +++ b/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result @@ -63,7 +63,7 @@ include/check_slave_is_running.inc connection slave; include/stop_slave.inc DELETE FROM t2; -CHANGE MASTER TO MASTER_LOG_POS=<master_pos_begin>; +CHANGE MASTER TO MASTER_LOG_POS=<master_pos_begin>, MASTER_USE_GTID=NO; BEGIN; SELECT * FROM t1 FOR UPDATE; a @@ -95,7 +95,7 @@ Warnings: Warning 1292 Truncated incorrect max_relay_log_size value: '0' include/stop_slave.inc DELETE FROM t2; -CHANGE MASTER TO MASTER_LOG_POS=<master_pos_begin>; +CHANGE MASTER TO MASTER_LOG_POS=<master_pos_begin>, MASTER_USE_GTID=NO; BEGIN; SELECT * FROM t1 FOR UPDATE; a diff --git a/mysql-test/suite/rpl/r/rpl_delayed_slave.result b/mysql-test/suite/rpl/r/rpl_delayed_slave.result index e7daa3328ce..c8c3bc36485 100644 --- a/mysql-test/suite/rpl/r/rpl_delayed_slave.result +++ b/mysql-test/suite/rpl/r/rpl_delayed_slave.result @@ -3,6 +3,9 @@ include/master-slave.inc call mtr.add_suppression("Unsafe statement written to the binary log using statement format"); connection slave; call mtr.add_suppression("Unsafe statement written to the binary log using statement format"); +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc connection master; [on master] CREATE TABLE t1 (a VARCHAR(100), b INT); @@ -153,7 +156,9 @@ CHANGE MASTER TO MASTER_DELAY = 71; include/start_slave.inc # Asserted this: Delay should be 71 when we set it to 71 include/stop_slave.inc -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' [on master] connection master; RESET MASTER; diff --git a/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result b/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result index 5865b75550f..be98b7e3dcd 100644 --- a/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result +++ b/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result @@ -437,7 +437,7 @@ connection master; ** Stop and Reset Slave ** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc ** create table slave side ** CREATE TABLE t10 (a INT PRIMARY KEY, b BLOB, c CHAR(5) @@ -482,7 +482,7 @@ connection slave; *** Create t11 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t11 (a INT PRIMARY KEY, b BLOB, c VARCHAR(254) ) ENGINE='InnoDB'; @@ -524,7 +524,7 @@ connection slave; *** Create t12 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t12 (a INT PRIMARY KEY, b BLOB, c BLOB ) ENGINE='InnoDB'; @@ -573,7 +573,7 @@ connection slave; *** Create t14 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t14 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5) ) ENGINE='InnoDB'; @@ -638,7 +638,7 @@ connection slave; include/wait_for_slave_sql_error.inc [errno=1091] Last_SQL_Error = 'Error 'Can't DROP COLUMN `c7`; check that it exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'' STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc *** Drop t14 *** DROP TABLE t14; @@ -655,7 +655,9 @@ START SLAVE; *** Create t15 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Warning 1948 Specified value for @@gtid_slave_pos contains no value for replication domain 0. This conflicts with the binary log which contains GTID 0-2-103. If MASTER_GTID_POS=CURRENT_POS is used, the binlog position will override the new value of @@gtid_slave_pos CREATE TABLE t15 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5) ) ENGINE='InnoDB'; @@ -693,7 +695,9 @@ connection slave; include/wait_for_slave_sql_error.inc [errno=1054] Last_SQL_Error = 'Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'' STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Warning 1948 Specified value for @@gtid_slave_pos contains no value for replication domain 0. This conflicts with the binary log which contains GTID 0-2-104. If MASTER_GTID_POS=CURRENT_POS is used, the binlog position will override the new value of @@gtid_slave_pos *** Drop t15 *** DROP TABLE t15; @@ -710,7 +714,9 @@ START SLAVE; *** Create t16 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Warning 1948 Specified value for @@gtid_slave_pos contains no value for replication domain 0. This conflicts with the binary log which contains GTID 0-2-105. If MASTER_GTID_POS=CURRENT_POS is used, the binlog position will override the new value of @@gtid_slave_pos CREATE TABLE t16 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5) ) ENGINE='InnoDB'; @@ -748,7 +754,9 @@ connection slave; include/wait_for_slave_sql_error.inc [errno=1072] Last_SQL_Error = 'Error 'Key column 'c6' doesn't exist in table' on query. Default database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'' STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Warning 1948 Specified value for @@gtid_slave_pos contains no value for replication domain 0. This conflicts with the binary log which contains GTID 0-2-106. If MASTER_GTID_POS=CURRENT_POS is used, the binlog position will override the new value of @@gtid_slave_pos *** Drop t16 *** DROP TABLE t16; @@ -765,7 +773,9 @@ START SLAVE; *** Create t17 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Warning 1948 Specified value for @@gtid_slave_pos contains no value for replication domain 0. This conflicts with the binary log which contains GTID 0-2-107. If MASTER_GTID_POS=CURRENT_POS is used, the binlog position will override the new value of @@gtid_slave_pos CREATE TABLE t17 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5) ) ENGINE='InnoDB'; @@ -831,7 +841,7 @@ connection slave; *** Create t18 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t18 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5) ) ENGINE='InnoDB'; @@ -896,7 +906,7 @@ connection slave; *** Create t5 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t5 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5) ) ENGINE='InnoDB'; diff --git a/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result b/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result index f47d79b5b86..53b20b188ba 100644 --- a/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result +++ b/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result @@ -437,7 +437,7 @@ connection master; ** Stop and Reset Slave ** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc ** create table slave side ** CREATE TABLE t10 (a INT PRIMARY KEY, b BLOB, c CHAR(5) @@ -482,7 +482,7 @@ connection slave; *** Create t11 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t11 (a INT PRIMARY KEY, b BLOB, c VARCHAR(254) ) ENGINE='MyISAM'; @@ -524,7 +524,7 @@ connection slave; *** Create t12 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t12 (a INT PRIMARY KEY, b BLOB, c BLOB ) ENGINE='MyISAM'; @@ -573,7 +573,7 @@ connection slave; *** Create t14 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t14 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5) ) ENGINE='MyISAM'; @@ -638,7 +638,7 @@ connection slave; include/wait_for_slave_sql_error.inc [errno=1091] Last_SQL_Error = 'Error 'Can't DROP COLUMN `c7`; check that it exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'' STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc *** Drop t14 *** DROP TABLE t14; @@ -655,7 +655,9 @@ START SLAVE; *** Create t15 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Warning 1948 Specified value for @@gtid_slave_pos contains no value for replication domain 0. This conflicts with the binary log which contains GTID 0-2-103. If MASTER_GTID_POS=CURRENT_POS is used, the binlog position will override the new value of @@gtid_slave_pos CREATE TABLE t15 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5) ) ENGINE='MyISAM'; @@ -693,7 +695,9 @@ connection slave; include/wait_for_slave_sql_error.inc [errno=1054] Last_SQL_Error = 'Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'' STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Warning 1948 Specified value for @@gtid_slave_pos contains no value for replication domain 0. This conflicts with the binary log which contains GTID 0-2-104. If MASTER_GTID_POS=CURRENT_POS is used, the binlog position will override the new value of @@gtid_slave_pos *** Drop t15 *** DROP TABLE t15; @@ -710,7 +714,9 @@ START SLAVE; *** Create t16 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Warning 1948 Specified value for @@gtid_slave_pos contains no value for replication domain 0. This conflicts with the binary log which contains GTID 0-2-105. If MASTER_GTID_POS=CURRENT_POS is used, the binlog position will override the new value of @@gtid_slave_pos CREATE TABLE t16 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5) ) ENGINE='MyISAM'; @@ -748,7 +754,9 @@ connection slave; include/wait_for_slave_sql_error.inc [errno=1072] Last_SQL_Error = 'Error 'Key column 'c6' doesn't exist in table' on query. Default database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'' STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Warning 1948 Specified value for @@gtid_slave_pos contains no value for replication domain 0. This conflicts with the binary log which contains GTID 0-2-106. If MASTER_GTID_POS=CURRENT_POS is used, the binlog position will override the new value of @@gtid_slave_pos *** Drop t16 *** DROP TABLE t16; @@ -765,7 +773,9 @@ START SLAVE; *** Create t17 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Warning 1948 Specified value for @@gtid_slave_pos contains no value for replication domain 0. This conflicts with the binary log which contains GTID 0-2-107. If MASTER_GTID_POS=CURRENT_POS is used, the binlog position will override the new value of @@gtid_slave_pos CREATE TABLE t17 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5) ) ENGINE='MyISAM'; @@ -831,7 +841,7 @@ connection slave; *** Create t18 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t18 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5) ) ENGINE='MyISAM'; @@ -896,7 +906,7 @@ connection slave; *** Create t5 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t5 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5) ) ENGINE='MyISAM'; diff --git a/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result b/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result index 13077c08e89..ea784e7fc21 100644 --- a/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result +++ b/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result @@ -5,7 +5,7 @@ call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]*. cannot **** Diff Table Def Start **** connection slave; STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc SET @saved_slave_type_conversions = @@slave_type_conversions; SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_NON_LOSSY'; CREATE TABLE t1 (a INT, b INT PRIMARY KEY, c CHAR(20), @@ -42,7 +42,7 @@ DROP TABLE t1; connection slave; *** Create t2 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t2 (a INT, b INT PRIMARY KEY, c CHAR(5), d FLOAT DEFAULT '2.00', e CHAR(5) DEFAULT 'TEST2') @@ -66,7 +66,9 @@ START SLAVE; include/wait_for_slave_sql_error.inc [errno=1677] Last_SQL_Error = 'Column 2 of table 'test.t2' cannot be converted from type 'char(10 octets)' to type 'char(5 octets) character set latin1'' STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Warning 1948 Specified value for @@gtid_slave_pos contains no value for replication domain 0. This conflicts with the binary log which contains GTID 0-2-4. If MASTER_GTID_POS=CURRENT_POS is used, the binlog position will override the new value of @@gtid_slave_pos SELECT * FROM t2 ORDER BY a; a b c d e connection master; @@ -79,7 +81,7 @@ DROP TABLE t2; connection slave; *** Create t3 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t3 (a INT, b INT PRIMARY KEY, c CHAR(20), d FLOAT DEFAULT '2.00', e CHAR(5) DEFAULT 'TEST2') @@ -109,7 +111,7 @@ DROP TABLE t3; connection slave; *** Create t4 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t4 (a INT, b INT PRIMARY KEY, c CHAR(20), d FLOAT DEFAULT '2.00', e CHAR(5) DEFAULT 'TEST2') @@ -138,7 +140,7 @@ DROP TABLE t4; connection slave; *** Create t5 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t5 (a INT PRIMARY KEY, b CHAR(5), c FLOAT, d INT, e DOUBLE, f DECIMAL(8,2))ENGINE='InnoDB'; @@ -167,7 +169,7 @@ DROP TABLE t5; connection slave; *** Create t6 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t6 (a INT PRIMARY KEY, b CHAR(5), c FLOAT, d INT)ENGINE='InnoDB'; *** Create t6 on Master *** @@ -198,7 +200,7 @@ connection slave; **** Extra Colums Start **** *** Create t7 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t7 (a INT KEY, b BLOB, c CHAR(5), d TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00', e CHAR(20) DEFAULT 'Extra Column Testing') @@ -234,7 +236,7 @@ DROP TABLE t7; connection slave; *** Create t8 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t8 (a INT KEY, b BLOB, c CHAR(5), d TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00', e INT)ENGINE='InnoDB'; @@ -256,7 +258,7 @@ connection master; DROP TABLE t8; connection slave; STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t9 (a INT KEY, b BLOB, c CHAR(5), d TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, @@ -289,7 +291,7 @@ DROP TABLE t9; connection slave; *** Create t10 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t10 (a INT KEY, b BLOB, f DOUBLE DEFAULT '233', c CHAR(5), e INT DEFAULT '1')ENGINE='InnoDB'; *** Create t10 on Master *** @@ -317,7 +319,7 @@ DROP TABLE t10; connection slave; *** Create t11 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t11 (a INT KEY, b BLOB, f INT, c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='InnoDB'; *** Create t11 on Master *** @@ -345,7 +347,7 @@ DROP TABLE t11; connection slave; *** Create t12 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t12 (a INT KEY, b BLOB, f TEXT, c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='InnoDB'; *** Create t12 on Master *** @@ -381,7 +383,7 @@ connection slave; *** BUG 22177 Start *** *** Create t13 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t13 (a INT KEY, b BLOB, c CHAR(5), d INT DEFAULT '1', e TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP @@ -419,7 +421,7 @@ connection slave; *** Alter Master Table Testing Start *** *** Create t14 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t14 (c1 INT KEY, c4 BLOB, c5 CHAR(5), c6 INT DEFAULT '1', c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP @@ -455,7 +457,7 @@ c1 c2 c3 c4 c5 c6 c7 3 3.00 If is does not, I will open a bug b1b1b1b1b1b1b1b1 QA 1 CURRENT_TIMESTAMP *** Create t14a on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t14a (c1 INT KEY, c4 BLOB, c5 CHAR(5), c6 INT DEFAULT '1', c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP @@ -488,7 +490,7 @@ c1 c4 c5 c6 c7 2 b1b1b1b1b1b1b1b1 JOE 1 CURRENT_TIMESTAMP 3 b1b1b1b1b1b1b1b1 QA 1 CURRENT_TIMESTAMP STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc *** Master Drop c5 *** connection master; ALTER TABLE t14a DROP COLUMN c5; @@ -547,7 +549,7 @@ DROP TABLE t14; connection slave; *** Create t15 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t15 (c1 INT KEY, c2 DECIMAL(8,2), c3 TEXT, c4 BLOB, c5 CHAR(5), c6 INT DEFAULT '1', @@ -615,7 +617,7 @@ DROP TABLE t15; connection slave; *** Create t16 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t16 (c1 INT KEY, c2 DECIMAL(8,2), c3 TEXT, c4 BLOB, c5 CHAR(5), c6 INT DEFAULT '1', @@ -687,7 +689,7 @@ connection slave; *** Alter Master End *** *** Create t17 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t17 (a SMALLINT, b INT PRIMARY KEY, c CHAR(5), d FLOAT DEFAULT '2.00', e CHAR(5) DEFAULT 'TEST2') diff --git a/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result b/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result index 897a87db66f..8ad7e98798a 100644 --- a/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result +++ b/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result @@ -5,7 +5,7 @@ call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]*. cannot **** Diff Table Def Start **** connection slave; STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc SET @saved_slave_type_conversions = @@slave_type_conversions; SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_NON_LOSSY'; CREATE TABLE t1 (a INT, b INT PRIMARY KEY, c CHAR(20), @@ -42,7 +42,7 @@ DROP TABLE t1; connection slave; *** Create t2 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t2 (a INT, b INT PRIMARY KEY, c CHAR(5), d FLOAT DEFAULT '2.00', e CHAR(5) DEFAULT 'TEST2') @@ -66,7 +66,9 @@ START SLAVE; include/wait_for_slave_sql_error.inc [errno=1677] Last_SQL_Error = 'Column 2 of table 'test.t2' cannot be converted from type 'char(10 octets)' to type 'char(5 octets) character set latin1'' STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Warning 1948 Specified value for @@gtid_slave_pos contains no value for replication domain 0. This conflicts with the binary log which contains GTID 0-2-4. If MASTER_GTID_POS=CURRENT_POS is used, the binlog position will override the new value of @@gtid_slave_pos SELECT * FROM t2 ORDER BY a; a b c d e connection master; @@ -79,7 +81,7 @@ DROP TABLE t2; connection slave; *** Create t3 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t3 (a INT, b INT PRIMARY KEY, c CHAR(20), d FLOAT DEFAULT '2.00', e CHAR(5) DEFAULT 'TEST2') @@ -109,7 +111,7 @@ DROP TABLE t3; connection slave; *** Create t4 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t4 (a INT, b INT PRIMARY KEY, c CHAR(20), d FLOAT DEFAULT '2.00', e CHAR(5) DEFAULT 'TEST2') @@ -138,7 +140,7 @@ DROP TABLE t4; connection slave; *** Create t5 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t5 (a INT PRIMARY KEY, b CHAR(5), c FLOAT, d INT, e DOUBLE, f DECIMAL(8,2))ENGINE='MyISAM'; @@ -167,7 +169,7 @@ DROP TABLE t5; connection slave; *** Create t6 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t6 (a INT PRIMARY KEY, b CHAR(5), c FLOAT, d INT)ENGINE='MyISAM'; *** Create t6 on Master *** @@ -198,7 +200,7 @@ connection slave; **** Extra Colums Start **** *** Create t7 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t7 (a INT KEY, b BLOB, c CHAR(5), d TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00', e CHAR(20) DEFAULT 'Extra Column Testing') @@ -234,7 +236,7 @@ DROP TABLE t7; connection slave; *** Create t8 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t8 (a INT KEY, b BLOB, c CHAR(5), d TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00', e INT)ENGINE='MyISAM'; @@ -256,7 +258,7 @@ connection master; DROP TABLE t8; connection slave; STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t9 (a INT KEY, b BLOB, c CHAR(5), d TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, @@ -289,7 +291,7 @@ DROP TABLE t9; connection slave; *** Create t10 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t10 (a INT KEY, b BLOB, f DOUBLE DEFAULT '233', c CHAR(5), e INT DEFAULT '1')ENGINE='MyISAM'; *** Create t10 on Master *** @@ -317,7 +319,7 @@ DROP TABLE t10; connection slave; *** Create t11 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t11 (a INT KEY, b BLOB, f INT, c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='MyISAM'; *** Create t11 on Master *** @@ -345,7 +347,7 @@ DROP TABLE t11; connection slave; *** Create t12 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t12 (a INT KEY, b BLOB, f TEXT, c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='MyISAM'; *** Create t12 on Master *** @@ -381,7 +383,7 @@ connection slave; *** BUG 22177 Start *** *** Create t13 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t13 (a INT KEY, b BLOB, c CHAR(5), d INT DEFAULT '1', e TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP @@ -419,7 +421,7 @@ connection slave; *** Alter Master Table Testing Start *** *** Create t14 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t14 (c1 INT KEY, c4 BLOB, c5 CHAR(5), c6 INT DEFAULT '1', c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP @@ -455,7 +457,7 @@ c1 c2 c3 c4 c5 c6 c7 3 3.00 If is does not, I will open a bug b1b1b1b1b1b1b1b1 QA 1 CURRENT_TIMESTAMP *** Create t14a on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t14a (c1 INT KEY, c4 BLOB, c5 CHAR(5), c6 INT DEFAULT '1', c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP @@ -488,7 +490,7 @@ c1 c4 c5 c6 c7 2 b1b1b1b1b1b1b1b1 JOE 1 CURRENT_TIMESTAMP 3 b1b1b1b1b1b1b1b1 QA 1 CURRENT_TIMESTAMP STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc *** Master Drop c5 *** connection master; ALTER TABLE t14a DROP COLUMN c5; @@ -547,7 +549,7 @@ DROP TABLE t14; connection slave; *** Create t15 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t15 (c1 INT KEY, c2 DECIMAL(8,2), c3 TEXT, c4 BLOB, c5 CHAR(5), c6 INT DEFAULT '1', @@ -615,7 +617,7 @@ DROP TABLE t15; connection slave; *** Create t16 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t16 (c1 INT KEY, c2 DECIMAL(8,2), c3 TEXT, c4 BLOB, c5 CHAR(5), c6 INT DEFAULT '1', @@ -687,7 +689,7 @@ connection slave; *** Alter Master End *** *** Create t17 on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t17 (a SMALLINT, b INT PRIMARY KEY, c CHAR(5), d FLOAT DEFAULT '2.00', e CHAR(5) DEFAULT 'TEST2') diff --git a/mysql-test/suite/rpl/r/rpl_gtid_basic.result b/mysql-test/suite/rpl/r/rpl_gtid_basic.result index 32df09789cc..fc7505e144f 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_basic.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_basic.result @@ -69,6 +69,8 @@ INSERT INTO t2 VALUES (5, "i1a"); connection server_4; CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT, MASTER_USE_GTID=CURRENT_POS; +Warnings: +Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead include/start_slave.inc SELECT * FROM t1 ORDER BY a; a b @@ -89,6 +91,8 @@ connection server_2; include/stop_slave.inc CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_4, MASTER_USE_GTID=CURRENT_POS; +Warnings: +Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead include/start_slave.inc connection server_4; UPDATE t2 SET b="j1a" WHERE a=5; @@ -117,6 +121,8 @@ include/save_master_gtid.inc connection server_3; CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_4, MASTER_USE_GTID=CURRENT_POS; +Warnings: +Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead include/start_slave.inc include/sync_with_master_gtid.inc SELECT * FROM t2 ORDER BY a; diff --git a/mysql-test/suite/rpl/r/rpl_gtid_crash.result b/mysql-test/suite/rpl/r/rpl_gtid_crash.result index 153081d9ca5..2f764fe4a0d 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_crash.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_crash.result @@ -14,7 +14,7 @@ call mtr.add_suppression('Master command COM_REGISTER_SLAVE failed: failed regis SET sql_log_bin=1; include/stop_slave.inc CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT, -MASTER_USE_GTID=CURRENT_POS; +MASTER_USE_GTID=SLAVE_POS; connection server_1; INSERT INTO t1 VALUES (2,1); INSERT INTO t1 VALUES (3,1); diff --git a/mysql-test/suite/rpl/r/rpl_gtid_errorhandling.result b/mysql-test/suite/rpl/r/rpl_gtid_errorhandling.result index 4c35d42d90a..a7cb710cc07 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_errorhandling.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_errorhandling.result @@ -75,6 +75,8 @@ INSERT INTO t1 VALUES (2); SET sql_log_bin = 1; INSERT INTO t1 VALUES (3); CHANGE MASTER TO master_use_gtid=current_pos; +Warnings: +Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead BEGIN; SET GLOBAL gtid_slave_pos = "100-100-100"; ERROR 25000: You are not allowed to execute this command in a transaction diff --git a/mysql-test/suite/rpl/r/rpl_gtid_excess_initial_delay.result b/mysql-test/suite/rpl/r/rpl_gtid_excess_initial_delay.result index 641d186ab78..4b2652ece8f 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_excess_initial_delay.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_excess_initial_delay.result @@ -3,7 +3,7 @@ include/master-slave.inc CREATE TABLE t1 (i INT); connection slave; include/stop_slave.inc -CHANGE MASTER TO MASTER_USE_GTID= current_pos, MASTER_DELAY= 10; +CHANGE MASTER TO MASTER_DELAY= 10; include/start_slave.inc connection master; INSERT INTO t1 VALUES (1); @@ -14,7 +14,7 @@ connection slave; # Asserted this: One row shoule be found in table t1. "======= Clean up ========" STOP SLAVE; -CHANGE MASTER TO MASTER_USE_GTID=no, MASTER_DELAY=0; +CHANGE MASTER TO MASTER_DELAY=0; START SLAVE; connection master; DROP TABLE t1; diff --git a/mysql-test/suite/rpl/r/rpl_gtid_master_promote.result b/mysql-test/suite/rpl/r/rpl_gtid_master_promote.result index 15bcb6621ff..92430be199a 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_master_promote.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_master_promote.result @@ -12,16 +12,12 @@ RETURN s; END| connection server_2; include/stop_slave.inc -CHANGE MASTER TO master_use_gtid=current_pos; connection server_3; include/stop_slave.inc -CHANGE MASTER TO master_use_gtid=current_pos; connection server_4; include/stop_slave.inc -CHANGE MASTER TO master_use_gtid=current_pos; connection server_5; include/stop_slave.inc -CHANGE MASTER TO master_use_gtid=current_pos; connection server_1; SET gtid_domain_id= 1; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; @@ -339,7 +335,7 @@ a b *** Now let the old master join up as slave. *** connection server_1; CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_2, -master_user = "root", master_use_gtid = current_pos; +master_user = "root", master_use_gtid = slave_pos, master_demote_to_slave=1; include/start_slave.inc SELECT * FROM t1 ORDER BY a; a diff --git a/mysql-test/suite/rpl/r/rpl_gtid_mdev4473.result b/mysql-test/suite/rpl/r/rpl_gtid_mdev4473.result index 5c80e64dc9b..9524dafb524 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_mdev4473.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_mdev4473.result @@ -12,7 +12,7 @@ include/wait_for_slave_to_stop.inc reset slave all; connection server_1; CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_2, -master_user='root', MASTER_USE_GTID=CURRENT_POS; +master_user='root', MASTER_USE_GTID=SLAVE_POS, master_demote_to_slave=1; include/start_slave.inc include/wait_for_slave_to_start.inc connection server_2; @@ -22,7 +22,7 @@ insert into t1 values (4); flush logs; connection server_3; CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_2, -MASTER_USE_GTID=CURRENT_POS; +MASTER_USE_GTID=SLAVE_POS; include/start_slave.inc select * from t1 order by n; n @@ -55,12 +55,12 @@ include/wait_for_slave_to_stop.inc reset slave all; connection server_2; CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_1, -master_user = 'root', MASTER_USE_GTID=CURRENT_POS; +master_user = 'root', MASTER_USE_GTID=SLAVE_POS, master_demote_to_slave=1; include/start_slave.inc connection server_3; include/stop_slave.inc CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_1, -MASTER_USE_GTID=CURRENT_POS; +MASTER_USE_GTID=SLAVE_POS; include/start_slave.inc connection server_1; drop table t1; diff --git a/mysql-test/suite/rpl/r/rpl_gtid_mdev4820.result b/mysql-test/suite/rpl/r/rpl_gtid_mdev4820.result index 606207c1d99..cea5aaaeacd 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_mdev4820.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_mdev4820.result @@ -45,6 +45,8 @@ SET GLOBAL gtid_slave_pos= '0-2-10'; connection server_1; CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_2, master_user= 'root', master_use_gtid=CURRENT_POS; +Warnings: +Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead START SLAVE; connection server_2; INSERT INTO t1 VALUES (11); @@ -67,11 +69,15 @@ a 11 include/stop_slave.inc RESET SLAVE ALL; +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'Current_Pos' to 'Slave_Pos' INSERT INTO t1 VALUES (12); connection server_2; INSERT INTO t1 VALUES (22); CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_1, master_user= 'root', master_use_gtid=CURRENT_POS; +Warnings: +Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead START SLAVE; SET sql_log_bin= 0; CALL mtr.add_suppression("which is not in the master's binlog. Since the master's binlog contains GTIDs with higher sequence numbers, it probably means that the slave has diverged"); diff --git a/mysql-test/suite/rpl/r/rpl_gtid_mdev9033.result b/mysql-test/suite/rpl/r/rpl_gtid_mdev9033.result index 9f0ad66bb83..2471f26bc04 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_mdev9033.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_mdev9033.result @@ -58,8 +58,8 @@ connection server_3; include/sync_with_master_gtid.inc connection server_2; STOP SLAVE; -CHANGE MASTER TO MASTER_USE_GTID = NO, IGNORE_DOMAIN_IDS = (); +CHANGE MASTER TO IGNORE_DOMAIN_IDS = (); connection server_3; STOP SLAVE; -CHANGE MASTER TO MASTER_USE_GTID = NO, IGNORE_DOMAIN_IDS = (); +CHANGE MASTER TO IGNORE_DOMAIN_IDS = (); # End of test. diff --git a/mysql-test/suite/rpl/r/rpl_gtid_misc.result b/mysql-test/suite/rpl/r/rpl_gtid_misc.result index a5c61759ed6..c4a64a13753 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_misc.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_misc.result @@ -9,7 +9,6 @@ include/stop_slave.inc SET sql_log_bin= 0; INSERT INTO t1 VALUES (1); SET sql_log_bin= 1; -CHANGE MASTER TO master_use_gtid= current_pos; connection master; CREATE TEMPORARY TABLE t2 LIKE t1; INSERT INTO t2 VALUE (1); diff --git a/mysql-test/suite/rpl/r/rpl_gtid_nobinlog.result b/mysql-test/suite/rpl/r/rpl_gtid_nobinlog.result index c42348d40ee..8b896560d39 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_nobinlog.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_nobinlog.result @@ -21,7 +21,7 @@ a b include/stop_slave.inc connection server_1; CHANGE MASTER TO master_host = '127.0.0.1', master_port = SLAVE_PORT, -master_user = 'root', master_use_gtid = current_pos; +master_user = 'root'; START SLAVE; include/wait_for_slave_to_start.inc connection server_2; @@ -50,8 +50,7 @@ INSERT INTO t1 VALUES (5, 1); INSERT INTO t1 VALUES (6, 1); include/save_master_gtid.inc connection server_2; -CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT, -master_use_gtid = current_pos; +CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT; START SLAVE; include/sync_with_master_gtid.inc SELECT * FROM t1 ORDER BY a; diff --git a/mysql-test/suite/rpl/r/rpl_gtid_reconnect.result b/mysql-test/suite/rpl/r/rpl_gtid_reconnect.result index 4f50d7c6d85..f9d6cd3b743 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_reconnect.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_reconnect.result @@ -1,8 +1,4 @@ include/rpl_init.inc [topology=1->2] -connection server_2; -include/stop_slave.inc -CHANGE MASTER TO master_use_gtid= current_pos; -include/start_slave.inc connection server_1; CREATE TABLE t1 (a INT); FLUSH LOGS; diff --git a/mysql-test/suite/rpl/r/rpl_gtid_sort.result b/mysql-test/suite/rpl/r/rpl_gtid_sort.result index 34c0fd32766..46a65e7d865 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_sort.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_sort.result @@ -58,7 +58,7 @@ SHOW VARIABLES LIKE 'gtid_binlog_state'; Variable_name Value gtid_binlog_state CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT, -MASTER_USE_GTID=CURRENT_POS; +MASTER_USE_GTID=SLAVE_POS; include/start_slave.inc SHOW VARIABLES LIKE 'gtid_binlog_pos'; Variable_name Value diff --git a/mysql-test/suite/rpl/r/rpl_gtid_startpos.result b/mysql-test/suite/rpl/r/rpl_gtid_startpos.result index 3c363004170..e38eddcc97a 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_startpos.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_startpos.result @@ -11,7 +11,7 @@ CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; connection server_2; SET GLOBAL gtid_slave_pos=""; CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT, -MASTER_USE_GTID=CURRENT_POS; +MASTER_USE_GTID=SLAVE_POS; include/start_slave.inc SELECT * FROM t1; a @@ -33,12 +33,12 @@ master-bin.000003 # connection server_2; SET GLOBAL gtid_slave_pos=""; CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT, -MASTER_USE_GTID=CURRENT_POS; +MASTER_USE_GTID=SLAVE_POS; START SLAVE; include/wait_for_slave_io_error.inc [errno=1236] include/stop_slave.inc CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT, -MASTER_LOG_FILE="master-bin.000003", MASTER_LOG_POS=4; +MASTER_LOG_FILE="master-bin.000003", MASTER_LOG_POS=4, MASTER_USE_GTID=NO; include/start_slave.inc SELECT * FROM t1 ORDER BY a; a @@ -55,7 +55,7 @@ include/save_master_gtid.inc connection server_2; SET GLOBAL gtid_slave_pos='0-1-3'; CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT, -MASTER_USE_GTID=CURRENT_POS; +MASTER_USE_GTID=SLAVE_POS; include/start_slave.inc include/sync_with_master_gtid.inc SELECT * FROM t1 ORDER by a; @@ -95,7 +95,7 @@ connection server_1; RESET MASTER; connection server_2; SET GLOBAL gtid_slave_pos=''; -CHANGE MASTER TO master_host='127.0.0.1', master_port=MASTER_PORT, master_user='root', master_use_gtid=current_pos; +CHANGE MASTER TO master_host='127.0.0.1', master_port=MASTER_PORT, master_user='root', master_use_gtid=slave_pos; include/start_slave.inc connection server_1; CREATE TABLE t1 (a INT PRIMARY KEY); @@ -145,12 +145,12 @@ a 2 *** Test that RESET SLAVE clears the Using_Gtid flag. *** include/stop_slave.inc -RESET SLAVE; +include/reset_slave.inc Using_Gtid = 'No' START SLAVE; include/wait_for_slave_sql_error.inc [errno=1050] STOP SLAVE IO_THREAD; -CHANGE MASTER TO MASTER_USE_GTID=CURRENT_POS; +CHANGE MASTER TO MASTER_USE_GTID=SLAVE_POS; include/start_slave.inc connection server_1; INSERT INTO t1 VALUES(3); @@ -209,9 +209,9 @@ include/sync_with_master_gtid.inc SELECT * FROM t1; a 10 -SELECT 'Current_Pos' AS Using_Gtid; +SELECT 'Slave_Pos' AS Using_Gtid; Using_Gtid -Current_Pos +Slave_Pos SELECT '0-1-2' AS Gtid_Slave_Pos; Gtid_Slave_Pos 0-1-2 @@ -238,6 +238,7 @@ connection server_2; include/stop_slave.inc DROP TABLE t1; RESET SLAVE ALL; +CHANGE MASTER TO MASTER_USE_GTID=NO; RESET MASTER; SET GLOBAL gtid_slave_pos= ""; CHANGE MASTER TO master_host='127.0.0.1', master_port=MASTER_PORT, master_user='root', master_use_gtid=no, master_log_file="", master_log_pos= 4; diff --git a/mysql-test/suite/rpl/r/rpl_gtid_stop_start.result b/mysql-test/suite/rpl/r/rpl_gtid_stop_start.result index 50f24d56e9a..ae0050c353a 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_stop_start.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_stop_start.result @@ -6,8 +6,7 @@ INSERT INTO t1 VALUES (1); connection server_2; include/stop_slave.inc Master_Log_File = 'master-bin.000001' -Using_Gtid = 'No' -CHANGE MASTER TO master_use_gtid=current_pos; +Using_Gtid = 'Slave_Pos' FLUSH LOGS; connection server_1; FLUSH LOGS; diff --git a/mysql-test/suite/rpl/r/rpl_gtid_until.result b/mysql-test/suite/rpl/r/rpl_gtid_until.result index 1032b8ddd5c..029d2367e50 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_until.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_until.result @@ -1,4 +1,8 @@ include/rpl_init.inc [topology=1->2] +connection server_2; +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc connection server_1; ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; CREATE FUNCTION extract_gtid(d VARCHAR(100), s VARCHAR(100)) @@ -25,7 +29,7 @@ ERROR HY000: Slave is already running include/stop_slave_io.inc START SLAVE UNTIL master_gtid_pos = ""; ERROR HY000: START SLAVE UNTIL master_gtid_pos requires that slave is using GTID -CHANGE MASTER TO master_use_gtid=current_pos; +CHANGE MASTER TO master_use_gtid=slave_pos; connection server_1; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; INSERT INTO t1 VALUES(1); @@ -54,7 +58,7 @@ a include/stop_slave.inc START SLAVE UNTIL master_gtid_pos = "1-10-100,2-20-200,0-1-300"; include/wait_for_slave_to_start.inc -Using_Gtid = 'Current_Pos' +Using_Gtid = 'Slave_Pos' Until_Condition = 'Gtid' connection server_1; INSERT INTO t1 VALUES (3); @@ -211,7 +215,7 @@ RESET MASTER; INSERT INTO t1 VALUES (10); connection server_2; CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_1, -master_user = "root", master_use_gtid = current_pos; +master_user = "root", master_use_gtid = slave_pos; START SLAVE UNTIL master_gtid_pos = '0-1-2'; include/wait_for_slave_to_start.inc connection server_1; diff --git a/mysql-test/suite/rpl/r/rpl_heartbeat_basic.result b/mysql-test/suite/rpl/r/rpl_heartbeat_basic.result index 1db69ea4b83..88e0214150b 100644 --- a/mysql-test/suite/rpl/r/rpl_heartbeat_basic.result +++ b/mysql-test/suite/rpl/r/rpl_heartbeat_basic.result @@ -14,12 +14,12 @@ connection slave; *** Default value *** CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root'; slave_net_timeout/slave_heartbeat_timeout=2.0000 -RESET SLAVE; +include/reset_slave.inc *** Reset slave affect *** SET @@global.slave_net_timeout=30; CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=5; -RESET SLAVE; +include/reset_slave.inc SHOW GLOBAL STATUS LIKE 'slave_heartbeat_period'; Variable_name Value Slave_heartbeat_period 15.000 @@ -31,7 +31,7 @@ SHOW GLOBAL STATUS LIKE 'slave_heartbeat_period'; Variable_name Value Slave_heartbeat_period 25.000 SET @@global.slave_net_timeout=@restore_slave_net_timeout; -RESET SLAVE; +include/reset_slave.inc *** Warning if updated slave_net_timeout < slave_heartbeat_timeout *** SET @@global.slave_net_timeout=FLOOR(SLAVE_HEARTBEAT_TIMEOUT)-1; @@ -223,11 +223,15 @@ INSERT INTO t1 VALUES (1, 'on slave', NULL); connection master; INSERT INTO t1 VALUES (1, 'on master', NULL); connection slave; +set sql_log_bin= 0; call mtr.add_suppression("Slave SQL.*Duplicate entry .1. for key .PRIMARY.. on query.* error.* 1062"); call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group"); +set sql_log_bin= 1; Heartbeat events are received while sql thread stopped (1 means 'yes'): 1 include/stop_slave.inc +set sql_log_bin= 0; DROP TABLE t1; +set sql_log_bin= 1; *** Master send to slave *** connection master; @@ -240,7 +244,9 @@ END| Warnings: Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it. connection slave; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Warning 1948 Specified value for @@gtid_slave_pos contains no value for replication domain 0. This conflicts with the binary log which contains GTID 0-2-2. If MASTER_GTID_POS=CURRENT_POS is used, the binlog position will override the new value of @@gtid_slave_pos CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=5; include/start_slave.inc connection master; @@ -256,8 +262,10 @@ connection slave; *** Flush logs on slave *** STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +set sql_log_bin= 0; DROP TABLE t1; +set sql_log_bin= 1; connection master; DROP TABLE t1; RESET MASTER; @@ -271,7 +279,7 @@ connection master; SET @@global.slave_compressed_protocol=1; connection slave; include/stop_slave.inc -RESET SLAVE; +include/reset_slave.inc SET @@global.slave_compressed_protocol=1; CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=0.1; include/start_slave.inc @@ -283,7 +291,7 @@ SET @@global.slave_compressed_protocol=0; *** Reset master *** connection slave; STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=0.1; include/start_slave.inc connection master; @@ -294,7 +302,7 @@ Heartbeat events are received after reset of master (1 means 'yes'): 1 *** Reload master *** connection slave; STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=0.1; include/start_slave.inc Heartbeat event received diff --git a/mysql-test/suite/rpl/r/rpl_heartbeat_ssl.result b/mysql-test/suite/rpl/r/rpl_heartbeat_ssl.result index ff7178ae700..533290d25ca 100644 --- a/mysql-test/suite/rpl/r/rpl_heartbeat_ssl.result +++ b/mysql-test/suite/rpl/r/rpl_heartbeat_ssl.result @@ -15,7 +15,8 @@ MASTER_LOG_FILE='MASTER_BINLOG', MASTER_SSL=1, MASTER_SSL_CA='MYSQL_TEST_DIR/std_data/cacert.pem', MASTER_SSL_CERT='MYSQL_TEST_DIR/std_data/client-cert.pem', -MASTER_SSL_KEY='MYSQL_TEST_DIR/std_data/client-key.pem'; +MASTER_SSL_KEY='MYSQL_TEST_DIR/std_data/client-key.pem', +MASTER_USE_GTID=NO; include/start_slave.inc Master_SSL_Allowed: Yes Heartbeat event has received diff --git a/mysql-test/suite/rpl/r/rpl_hrtime.result b/mysql-test/suite/rpl/r/rpl_hrtime.result index 5f0b8f4123a..230029d9119 100644 --- a/mysql-test/suite/rpl/r/rpl_hrtime.result +++ b/mysql-test/suite/rpl/r/rpl_hrtime.result @@ -37,7 +37,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1293832861/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/rpl/r/rpl_innodb_bug68220.result b/mysql-test/suite/rpl/r/rpl_innodb_bug68220.result deleted file mode 100644 index a9c8c6d612f..00000000000 --- a/mysql-test/suite/rpl/r/rpl_innodb_bug68220.result +++ /dev/null @@ -1,233 +0,0 @@ -include/master-slave.inc -[connection master] -connection master; -select variable_value into @master_rows_read from information_schema.global_status where variable_name = 'innodb_rows_read'; -select variable_value into @master_rows_updated from information_schema.global_status where variable_name = 'innodb_rows_updated'; -select variable_value into @master_rows_deleted from information_schema.global_status where variable_name = 'innodb_rows_deleted'; -select variable_value into @master_rows_inserted from information_schema.global_status where variable_name = 'innodb_rows_inserted'; -select variable_value into @master_system_rows_read from information_schema.global_status where variable_name = 'innodb_system_rows_read'; -select variable_value into @master_system_rows_updated from information_schema.global_status where variable_name = 'innodb_system_rows_updated'; -select variable_value into @master_system_rows_deleted from information_schema.global_status where variable_name = 'innodb_system_rows_deleted'; -select variable_value into @master_system_rows_inserted from information_schema.global_status where variable_name = 'innodb_system_rows_inserted'; -connection slave; -select variable_value into @slave_rows_read from information_schema.global_status where variable_name = 'innodb_rows_read'; -select variable_value into @slave_rows_updated from information_schema.global_status where variable_name = 'innodb_rows_updated'; -select variable_value into @slave_rows_deleted from information_schema.global_status where variable_name = 'innodb_rows_deleted'; -select variable_value into @slave_rows_inserted from information_schema.global_status where variable_name = 'innodb_rows_inserted'; -select variable_value into @slave_system_rows_read from information_schema.global_status where variable_name = 'innodb_system_rows_read'; -select variable_value into @slave_system_rows_updated from information_schema.global_status where variable_name = 'innodb_system_rows_updated'; -select variable_value into @slave_system_rows_deleted from information_schema.global_status where variable_name = 'innodb_system_rows_deleted'; -select variable_value into @slave_system_rows_inserted from information_schema.global_status where variable_name = 'innodb_system_rows_inserted'; -connection master; -CREATE DATABASE testdb; -USE testdb; -CREATE TABLE testdb.t1 (i int NOT NULL PRIMARY KEY) ENGINE=InnoDB; -INSERT INTO testdb.t1 VALUES (1); -connection master; -select variable_value into @rows_read from information_schema.global_status where variable_name = 'innodb_rows_read'; -select @rows_read - @master_rows_read; -@rows_read - @master_rows_read -0 -select variable_value into @rows_updated from information_schema.global_status where variable_name = 'innodb_rows_updated'; -select @rows_updated - @master_rows_updated; -@rows_updated - @master_rows_updated -0 -select variable_value into @rows_deleted from information_schema.global_status where variable_name = 'innodb_rows_deleted'; -select @rows_deleted - @master_rows_deleted; -@rows_deleted - @master_rows_deleted -0 -select variable_value into @rows_inserted from information_schema.global_status where variable_name = 'innodb_rows_inserted'; -select @rows_inserted - @master_rows_inserted; -@rows_inserted - @master_rows_inserted -1 -select variable_value into @system_rows_read from information_schema.global_status where variable_name = 'innodb_system_rows_read'; -select @system_rows_read - @master_system_rows_read; -@system_rows_read - @master_system_rows_read -0 -select variable_value into @system_rows_updated from information_schema.global_status where variable_name = 'innodb_system_rows_updated'; -select @system_rows_updated - @master_system_rows_updated; -@system_rows_updated - @master_system_rows_updated -0 -select variable_value into @system_rows_deleted from information_schema.global_status where variable_name = 'innodb_system_rows_deleted'; -select @system_rows_deleted - @master_system_rows_deleted; -@system_rows_deleted - @master_system_rows_deleted -0 -select variable_value into @system_rows_inserted from information_schema.global_status where variable_name = 'innodb_system_rows_inserted'; -select @system_rows_inserted - @master_system_rows_inserted; -@system_rows_inserted - @master_system_rows_inserted -0 -connection slave; -select variable_value into @rows_read from information_schema.global_status where variable_name = 'innodb_rows_read'; -select @rows_read - @slave_rows_read; -@rows_read - @slave_rows_read -0 -select variable_value into @rows_updated from information_schema.global_status where variable_name = 'innodb_rows_updated'; -select @rows_updated - @slave_rows_updated; -@rows_updated - @slave_rows_updated -0 -select variable_value into @rows_deleted from information_schema.global_status where variable_name = 'innodb_rows_deleted'; -select @rows_deleted - @slave_rows_deleted; -@rows_deleted - @slave_rows_deleted -0 -select variable_value into @rows_inserted from information_schema.global_status where variable_name = 'innodb_rows_inserted'; -select @rows_inserted - @slave_rows_inserted; -@rows_inserted - @slave_rows_inserted -1 -select variable_value into @system_rows_read from information_schema.global_status where variable_name = 'innodb_system_rows_read'; -select @system_rows_read - @slave_system_rows_read; -@system_rows_read - @slave_system_rows_read -0 -select variable_value into @system_rows_updated from information_schema.global_status where variable_name = 'innodb_system_rows_updated'; -select @system_rows_updated - @slave_system_rows_updated; -@system_rows_updated - @slave_system_rows_updated -0 -select variable_value into @system_rows_deleted from information_schema.global_status where variable_name = 'innodb_system_rows_deleted'; -select @system_rows_deleted - @slave_system_rows_deleted; -@system_rows_deleted - @slave_system_rows_deleted -0 -select variable_value into @system_rows_inserted from information_schema.global_status where variable_name = 'innodb_system_rows_inserted'; -select @system_rows_inserted - @slave_system_rows_inserted; -@system_rows_inserted - @slave_system_rows_inserted -0 -connection master; -UPDATE t1 SET i=2 WHERE i=1; -connection slave; -connection master; -select variable_value into @rows_read from information_schema.global_status where variable_name = 'innodb_rows_read'; -select @rows_read - @master_rows_read; -@rows_read - @master_rows_read -1 -select variable_value into @rows_updated from information_schema.global_status where variable_name = 'innodb_rows_updated'; -select @rows_updated - @master_rows_updated; -@rows_updated - @master_rows_updated -1 -select variable_value into @rows_deleted from information_schema.global_status where variable_name = 'innodb_rows_deleted'; -select @rows_deleted - @master_rows_deleted; -@rows_deleted - @master_rows_deleted -0 -select variable_value into @rows_inserted from information_schema.global_status where variable_name = 'innodb_rows_inserted'; -select @rows_inserted - @master_rows_inserted; -@rows_inserted - @master_rows_inserted -1 -select variable_value into @system_rows_read from information_schema.global_status where variable_name = 'innodb_system_rows_read'; -select @system_rows_read - @master_system_rows_read; -@system_rows_read - @master_system_rows_read -0 -select variable_value into @system_rows_updated from information_schema.global_status where variable_name = 'innodb_system_rows_updated'; -select @system_rows_updated - @master_system_rows_updated; -@system_rows_updated - @master_system_rows_updated -0 -select variable_value into @system_rows_deleted from information_schema.global_status where variable_name = 'innodb_system_rows_deleted'; -select @system_rows_deleted - @master_system_rows_deleted; -@system_rows_deleted - @master_system_rows_deleted -0 -select variable_value into @system_rows_inserted from information_schema.global_status where variable_name = 'innodb_system_rows_inserted'; -select @system_rows_inserted - @master_system_rows_inserted; -@system_rows_inserted - @master_system_rows_inserted -0 -connection slave; -select variable_value into @rows_read from information_schema.global_status where variable_name = 'innodb_rows_read'; -select @rows_read - @slave_rows_read; -@rows_read - @slave_rows_read -1 -select variable_value into @rows_updated from information_schema.global_status where variable_name = 'innodb_rows_updated'; -select @rows_updated - @slave_rows_updated; -@rows_updated - @slave_rows_updated -1 -select variable_value into @rows_deleted from information_schema.global_status where variable_name = 'innodb_rows_deleted'; -select @rows_deleted - @slave_rows_deleted; -@rows_deleted - @slave_rows_deleted -0 -select variable_value into @rows_inserted from information_schema.global_status where variable_name = 'innodb_rows_inserted'; -select @rows_inserted - @slave_rows_inserted; -@rows_inserted - @slave_rows_inserted -1 -select variable_value into @system_rows_read from information_schema.global_status where variable_name = 'innodb_system_rows_read'; -select @system_rows_read - @slave_system_rows_read; -@system_rows_read - @slave_system_rows_read -0 -select variable_value into @system_rows_updated from information_schema.global_status where variable_name = 'innodb_system_rows_updated'; -select @system_rows_updated - @slave_system_rows_updated; -@system_rows_updated - @slave_system_rows_updated -0 -select variable_value into @system_rows_deleted from information_schema.global_status where variable_name = 'innodb_system_rows_deleted'; -select @system_rows_deleted - @slave_system_rows_deleted; -@system_rows_deleted - @slave_system_rows_deleted -0 -select variable_value into @system_rows_inserted from information_schema.global_status where variable_name = 'innodb_system_rows_inserted'; -select @system_rows_inserted - @slave_system_rows_inserted; -@system_rows_inserted - @slave_system_rows_inserted -0 -connection master; -DELETE FROM t1 WHERE i=2; -connection master; -select variable_value into @rows_read from information_schema.global_status where variable_name = 'innodb_rows_read'; -select @rows_read - @master_rows_read; -@rows_read - @master_rows_read -2 -select variable_value into @rows_updated from information_schema.global_status where variable_name = 'innodb_rows_updated'; -select @rows_updated - @master_rows_updated; -@rows_updated - @master_rows_updated -1 -select variable_value into @rows_deleted from information_schema.global_status where variable_name = 'innodb_rows_deleted'; -select @rows_deleted - @master_rows_deleted; -@rows_deleted - @master_rows_deleted -1 -select variable_value into @rows_inserted from information_schema.global_status where variable_name = 'innodb_rows_inserted'; -select @rows_inserted - @master_rows_inserted; -@rows_inserted - @master_rows_inserted -1 -select variable_value into @system_rows_read from information_schema.global_status where variable_name = 'innodb_system_rows_read'; -select @system_rows_read - @master_system_rows_read; -@system_rows_read - @master_system_rows_read -0 -select variable_value into @system_rows_updated from information_schema.global_status where variable_name = 'innodb_system_rows_updated'; -select @system_rows_updated - @master_system_rows_updated; -@system_rows_updated - @master_system_rows_updated -0 -select variable_value into @system_rows_deleted from information_schema.global_status where variable_name = 'innodb_system_rows_deleted'; -select @system_rows_deleted - @master_system_rows_deleted; -@system_rows_deleted - @master_system_rows_deleted -0 -select variable_value into @system_rows_inserted from information_schema.global_status where variable_name = 'innodb_system_rows_inserted'; -select @system_rows_inserted - @master_system_rows_inserted; -@system_rows_inserted - @master_system_rows_inserted -0 -connection slave; -select variable_value into @rows_read from information_schema.global_status where variable_name = 'innodb_rows_read'; -select @rows_read - @slave_rows_read; -@rows_read - @slave_rows_read -2 -select variable_value into @rows_updated from information_schema.global_status where variable_name = 'innodb_rows_updated'; -select @rows_updated - @slave_rows_updated; -@rows_updated - @slave_rows_updated -1 -select variable_value into @rows_deleted from information_schema.global_status where variable_name = 'innodb_rows_deleted'; -select @rows_deleted - @slave_rows_deleted; -@rows_deleted - @slave_rows_deleted -1 -select variable_value into @rows_inserted from information_schema.global_status where variable_name = 'innodb_rows_inserted'; -select @rows_inserted - @slave_rows_inserted; -@rows_inserted - @slave_rows_inserted -1 -select variable_value into @system_rows_read from information_schema.global_status where variable_name = 'innodb_system_rows_read'; -select @system_rows_read - @slave_system_rows_read; -@system_rows_read - @slave_system_rows_read -0 -select variable_value into @system_rows_updated from information_schema.global_status where variable_name = 'innodb_system_rows_updated'; -select @system_rows_updated - @slave_system_rows_updated; -@system_rows_updated - @slave_system_rows_updated -0 -select variable_value into @system_rows_deleted from information_schema.global_status where variable_name = 'innodb_system_rows_deleted'; -select @system_rows_deleted - @slave_system_rows_deleted; -@system_rows_deleted - @slave_system_rows_deleted -0 -select variable_value into @system_rows_inserted from information_schema.global_status where variable_name = 'innodb_system_rows_inserted'; -select @system_rows_inserted - @slave_system_rows_inserted; -@system_rows_inserted - @slave_system_rows_inserted -0 -connection master; -DROP TABLE t1; -DROP DATABASE testdb; -connection slave; -include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_loaddata.result b/mysql-test/suite/rpl/r/rpl_loaddata.result index e759f34bb9d..0be197642e9 100644 --- a/mysql-test/suite/rpl/r/rpl_loaddata.result +++ b/mysql-test/suite/rpl/r/rpl_loaddata.result @@ -57,7 +57,9 @@ load data infile '../../std_data/rpl_loaddata.dat' into table t1; connection slave; include/wait_for_slave_sql_error.inc [errno=1062] stop slave; -reset slave; +include/reset_slave.inc +Warnings: +Warning 1948 Specified value for @@gtid_slave_pos contains no value for replication domain 0. This conflicts with the binary log which contains GTID 0-2-14. If MASTER_GTID_POS=CURRENT_POS is used, the binlog position will override the new value of @@gtid_slave_pos include/check_slave_no_error.inc connection master; reset master; diff --git a/mysql-test/suite/rpl/r/rpl_log_pos.result b/mysql-test/suite/rpl/r/rpl_log_pos.result index 7f5f34bf831..74080b3936f 100644 --- a/mysql-test/suite/rpl/r/rpl_log_pos.result +++ b/mysql-test/suite/rpl/r/rpl_log_pos.result @@ -9,7 +9,7 @@ File Position Binlog_Do_DB Binlog_Ignore_DB master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB> connection slave; include/stop_slave.inc -change master to master_log_pos=MASTER_LOG_POS; +change master to master_log_pos=MASTER_LOG_POS, master_use_gtid=no; start slave; include/wait_for_slave_io_error.inc [errno=1236] Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'binlog truncated in the middle of event; consider out of disk space on master; the first event 'master-bin.000001' at XXX, the last event read from 'master-bin.000001' at XXX, the last byte read from 'master-bin.000001' at XXX.'' @@ -23,7 +23,7 @@ drop table if exists t1; create table t1 (n int); insert into t1 values (1),(2),(3); connection slave; -change master to master_log_pos=MASTER_LOG_POS; +change master to master_log_pos=MASTER_LOG_POS, master_use_gtid=no; start slave; select * from t1 ORDER BY n; n diff --git a/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result b/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result index 78a86437867..9de66d179a6 100644 --- a/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result +++ b/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result @@ -1,5 +1,10 @@ include/master-slave.inc [connection master] +connection slave; +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc +connection master; FLUSH LOGS; CREATE TABLE t1(c1 INT); connection slave; diff --git a/mysql-test/suite/rpl/r/rpl_mariadb_slave_capability.result b/mysql-test/suite/rpl/r/rpl_mariadb_slave_capability.result index ac846ac6c00..68e8b22dd02 100644 --- a/mysql-test/suite/rpl/r/rpl_mariadb_slave_capability.result +++ b/mysql-test/suite/rpl/r/rpl_mariadb_slave_capability.result @@ -4,6 +4,9 @@ connection master; set @old_master_binlog_checksum= @@global.binlog_checksum; connection slave; include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc +include/stop_slave.inc # Test slave with no capability gets dummy event, which is ignored. set @old_dbug= @@global.debug_dbug; SET @@global.debug_dbug='+d,simulate_slave_capability_none'; diff --git a/mysql-test/suite/rpl/r/rpl_mdev382.result b/mysql-test/suite/rpl/r/rpl_mdev382.result index b88b47b2dfa..6a91d9d89de 100644 --- a/mysql-test/suite/rpl/r/rpl_mdev382.result +++ b/mysql-test/suite/rpl/r/rpl_mdev382.result @@ -179,7 +179,7 @@ ROLLBACK/*!*/; use `db1``; select 'oops!'`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -279,7 +279,7 @@ ROLLBACK/*!*/; use `db1``; select 'oops!'`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -388,7 +388,7 @@ START TRANSACTION use `ts``et`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/rpl/r/rpl_mdev6020.result b/mysql-test/suite/rpl/r/rpl_mdev6020.result index b0cb392b04c..fbea6ac38d2 100644 --- a/mysql-test/suite/rpl/r/rpl_mdev6020.result +++ b/mysql-test/suite/rpl/r/rpl_mdev6020.result @@ -13,7 +13,7 @@ SET @old_engine= @@GLOBAL.default_storage_engine; SET GLOBAL default_storage_engine=InnoDB; SET @old_parallel= @@GLOBAL.slave_parallel_threads; SET GLOBAL slave_parallel_threads=12; -CHANGE MASTER TO master_host='127.0.0.1', master_port=SERVER_MYPORT_1, master_user='root', master_log_file='master-bin.000001', master_log_pos=4; +CHANGE MASTER TO master_host='127.0.0.1', master_port=SERVER_MYPORT_1, master_user='root', master_log_file='master-bin.000001', master_log_pos=4, master_use_gtid=no; include/start_slave.inc connection master; SET SQL_LOG_BIN=0; diff --git a/mysql-test/suite/rpl/r/rpl_mdev6386.result b/mysql-test/suite/rpl/r/rpl_mdev6386.result index d0e5144857a..63ce594a604 100644 --- a/mysql-test/suite/rpl/r/rpl_mdev6386.result +++ b/mysql-test/suite/rpl/r/rpl_mdev6386.result @@ -10,7 +10,6 @@ SET sql_log_bin= 0; CALL mtr.add_suppression("Commit failed due to failure of an earlier commit on which this one depends"); INSERT INTO t1 VALUES (1, 2); SET sql_log_bin= 1; -CHANGE MASTER TO master_use_gtid= current_pos; Contents on slave before: SELECT * FROM t1 ORDER BY a; a b diff --git a/mysql-test/suite/rpl/r/rpl_mdev_17614.result b/mysql-test/suite/rpl/r/rpl_mdev_17614.result index ba077111522..0cc924749c8 100644 --- a/mysql-test/suite/rpl/r/rpl_mdev_17614.result +++ b/mysql-test/suite/rpl/r/rpl_mdev_17614.result @@ -31,7 +31,7 @@ a b c 2 2 3 stop slave; include/wait_for_slave_to_stop.inc -reset slave; +include/reset_slave.inc connection master; reset master; drop table t1; @@ -191,7 +191,7 @@ a b c 2 2 3 stop slave; include/wait_for_slave_to_stop.inc -reset slave; +include/reset_slave.inc connection master; reset master; drop table t1; diff --git a/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result b/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result index 944ad9331ad..e94e097f41f 100644 --- a/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result +++ b/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result @@ -1,5 +1,10 @@ include/master-slave.inc [connection master] +connection slave; +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc +connection master; call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); call mtr.add_suppression("Write to binary log failed: Multi-row statements required more than .max_binlog_stmt_cache_size"); call mtr.add_suppression("Write to binary log failed: Multi-statement transaction required more than .max_binlog_cache_size"); diff --git a/mysql-test/suite/rpl/r/rpl_mysql57_stm_temporal_round.result b/mysql-test/suite/rpl/r/rpl_mysql57_stm_temporal_round.result index bedd103c2a0..7a5cf257458 100644 --- a/mysql-test/suite/rpl/r/rpl_mysql57_stm_temporal_round.result +++ b/mysql-test/suite/rpl/r/rpl_mysql57_stm_temporal_round.result @@ -10,7 +10,7 @@ connection master; include/rpl_stop_server.inc [server_number=1] include/rpl_start_server.inc [server_number=1] connection slave; -CHANGE MASTER TO master_host='127.0.0.1', master_port=SERVER_MYPORT_1, master_user='root', master_log_file='master-bin.000001', master_log_pos=4; +CHANGE MASTER TO master_host='127.0.0.1', master_port=SERVER_MYPORT_1, master_user='root', master_log_file='master-bin.000001', master_log_pos=4, master_use_gtid=no; include/start_slave.inc connection master; connection slave; diff --git a/mysql-test/suite/rpl/r/rpl_mysql80_stm_temporal_round.result b/mysql-test/suite/rpl/r/rpl_mysql80_stm_temporal_round.result index 23b3217895a..8e1d3d03952 100644 --- a/mysql-test/suite/rpl/r/rpl_mysql80_stm_temporal_round.result +++ b/mysql-test/suite/rpl/r/rpl_mysql80_stm_temporal_round.result @@ -10,7 +10,7 @@ connection master; include/rpl_stop_server.inc [server_number=1] include/rpl_start_server.inc [server_number=1] connection slave; -CHANGE MASTER TO master_host='127.0.0.1', master_port=SERVER_MYPORT_1, master_user='root', master_log_file='master-bin.000001', master_log_pos=4; +CHANGE MASTER TO master_host='127.0.0.1', master_port=SERVER_MYPORT_1, master_user='root', master_log_file='master-bin.000001', master_log_pos=4, master_use_gtid=no; include/start_slave.inc connection master; connection slave; diff --git a/mysql-test/suite/rpl/r/rpl_old_master.result b/mysql-test/suite/rpl/r/rpl_old_master.result index f985bee6832..5e9d8a88a20 100644 --- a/mysql-test/suite/rpl/r/rpl_old_master.result +++ b/mysql-test/suite/rpl/r/rpl_old_master.result @@ -8,7 +8,7 @@ include/rpl_start_server.inc [server_number=1] connection slave; SET @old_parallel= @@GLOBAL.slave_parallel_threads; SET GLOBAL slave_parallel_threads=10; -CHANGE MASTER TO master_host='127.0.0.1', master_port=SERVER_MYPORT_1, master_user='root', master_log_file='master-bin.000001', master_log_pos=4; +CHANGE MASTER TO master_host='127.0.0.1', master_port=SERVER_MYPORT_1, master_user='root', master_log_file='master-bin.000001', master_log_pos=4, master_use_gtid=no; FLUSH TABLES WITH READ LOCK; include/start_slave.inc include/wait_for_slave_param.inc [Seconds_Behind_Master] diff --git a/mysql-test/suite/rpl/r/rpl_old_master_29078.result b/mysql-test/suite/rpl/r/rpl_old_master_29078.result index 944c6c2a0bb..093e2ae0c24 100644 --- a/mysql-test/suite/rpl/r/rpl_old_master_29078.result +++ b/mysql-test/suite/rpl/r/rpl_old_master_29078.result @@ -47,45 +47,47 @@ ROLLBACK /* added by mysqlbinlog */; /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/; /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/; connection slave; -set global explicit_defaults_for_timestamp=1; -reset slave; +set global explicit_defaults_for_timestamp=0; +include/reset_slave.inc include/start_slave.inc show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `f1` timestamp NULL DEFAULT NULL, - `f2` timestamp NULL DEFAULT NULL + `f1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `f2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` timestamp NULL DEFAULT NULL + `a` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci set time_zone='+2:00'; select * from t1; f1 f2 -NULL NULL -NULL NULL +2022-07-23 16:24:48 2022-07-23 16:24:48 +2022-07-23 16:25:35 0000-00-00 00:00:00 drop table t1; include/stop_slave.inc -set global explicit_defaults_for_timestamp=0; -reset slave; +set global explicit_defaults_for_timestamp=1; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' include/start_slave.inc show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `f1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `f2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' + `f1` timestamp NULL DEFAULT NULL, + `f2` timestamp NULL DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `a` timestamp NULL DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci select * from t1; f1 f2 -2022-07-23 16:24:48 2022-07-23 16:24:48 -2022-07-23 16:25:35 0000-00-00 00:00:00 +NULL NULL +NULL NULL drop table t1; connection master; drop table t2; diff --git a/mysql-test/suite/rpl/r/rpl_parallel_29322.result b/mysql-test/suite/rpl/r/rpl_parallel_29322.result index 55fa6a4acc3..205a7dbc9cf 100644 --- a/mysql-test/suite/rpl/r/rpl_parallel_29322.result +++ b/mysql-test/suite/rpl/r/rpl_parallel_29322.result @@ -16,7 +16,7 @@ set @@global.slave_parallel_workers = 1; include/start_slave.inc connection slave; include/stop_slave.inc -reset slave; +include/reset_slave.inc connection master; reset master; create table t2 (a timestamp, b int); @@ -109,7 +109,9 @@ connection slave; set @@global.explicit_defaults_for_timestamp = 1; connection slave; include/stop_slave.inc -reset slave; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' connection master; reset master; create table t2 (a timestamp, b int); @@ -201,7 +203,9 @@ set @@global.slave_parallel_workers = 4; include/start_slave.inc connection slave; include/stop_slave.inc -reset slave; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' connection master; reset master; create table t2 (a timestamp, b int); diff --git a/mysql-test/suite/rpl/r/rpl_parallel_mdev6589.result b/mysql-test/suite/rpl/r/rpl_parallel_mdev6589.result index 47cdb3496da..2e5ac97bf4d 100644 --- a/mysql-test/suite/rpl/r/rpl_parallel_mdev6589.result +++ b/mysql-test/suite/rpl/r/rpl_parallel_mdev6589.result @@ -4,7 +4,6 @@ connection server_2; SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; include/stop_slave.inc SET GLOBAL slave_parallel_threads=10; -CHANGE MASTER TO master_use_gtid=current_pos; include/start_slave.inc *** MDEV-6589: Incorrect relay log start position when restarting SQL thread after error in parallel replication *** connection server_1; diff --git a/mysql-test/suite/rpl/r/rpl_parallel_multilevel2.result b/mysql-test/suite/rpl/r/rpl_parallel_multilevel2.result index 674cd7a32b4..ba59650983b 100644 --- a/mysql-test/suite/rpl/r/rpl_parallel_multilevel2.result +++ b/mysql-test/suite/rpl/r/rpl_parallel_multilevel2.result @@ -17,12 +17,10 @@ SET GLOBAL binlog_commit_wait_usec=2000000; SET @old_updates= @@GLOBAL.binlog_direct_non_transactional_updates; SET GLOBAL binlog_direct_non_transactional_updates=OFF; SET SESSION binlog_direct_non_transactional_updates=OFF; -CHANGE MASTER TO master_use_gtid=current_pos; connection server_3; SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; include/stop_slave.inc SET GLOBAL slave_parallel_threads=10; -CHANGE MASTER TO master_use_gtid=current_pos; connection server_1; BEGIN; CREATE TEMPORARY TABLE t2 (a INT PRIMARY KEY) ENGINE=MEMORY; diff --git a/mysql-test/suite/rpl/r/rpl_parallel_temptable.result b/mysql-test/suite/rpl/r/rpl_parallel_temptable.result index 1a1c12f836d..e9bff03bd41 100644 --- a/mysql-test/suite/rpl/r/rpl_parallel_temptable.result +++ b/mysql-test/suite/rpl/r/rpl_parallel_temptable.result @@ -4,7 +4,6 @@ connection server_2; SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; include/stop_slave.inc SET GLOBAL slave_parallel_threads=5; -CHANGE MASTER TO master_use_gtid= current_pos; include/start_slave.inc connection server_1; CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(100) CHARACTER SET utf8); diff --git a/mysql-test/suite/rpl/r/rpl_perfschema_applier_status_by_coordinator.result b/mysql-test/suite/rpl/r/rpl_perfschema_applier_status_by_coordinator.result index 88e1848d46e..ffffb580518 100644 --- a/mysql-test/suite/rpl/r/rpl_perfschema_applier_status_by_coordinator.result +++ b/mysql-test/suite/rpl/r/rpl_perfschema_applier_status_by_coordinator.result @@ -55,6 +55,7 @@ connection slave; include/stop_slave.inc reset slave; reset master; +set @@global.gtid_slave_pos= ""; set @saved_slave_trans_retry_interval= @@GLOBAL.slave_transaction_retry_interval; set global slave_transaction_retry_interval=1; include/start_slave.inc diff --git a/mysql-test/suite/rpl/r/rpl_perfschema_connect_config.result b/mysql-test/suite/rpl/r/rpl_perfschema_connect_config.result index 4ace84ffac4..27cb29d3968 100644 --- a/mysql-test/suite/rpl/r/rpl_perfschema_connect_config.result +++ b/mysql-test/suite/rpl/r/rpl_perfschema_connect_config.result @@ -87,6 +87,8 @@ include/assert.inc [Value returned by SSS and PS table for Using_Gtid should be change master to master_user = 'root', master_use_gtid= CURRENT_POS; +Warnings: +Warning #### 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead include/assert.inc [Value returned by SSS and PS table for Using_Gtid should be same.] # 3) Test for Auto_position= SLAVE_POS diff --git a/mysql-test/suite/rpl/r/rpl_read_new_relay_log_info.result b/mysql-test/suite/rpl/r/rpl_read_new_relay_log_info.result index 5c0002a911a..e193a7e1126 100644 --- a/mysql-test/suite/rpl/r/rpl_read_new_relay_log_info.result +++ b/mysql-test/suite/rpl/r/rpl_read_new_relay_log_info.result @@ -6,7 +6,7 @@ DROP TABLE t1; connection slave; ==== Check that we can understand the new format of relay-log.info ==== include/stop_slave.inc -RESET SLAVE; +include/reset_slave.inc # Read relay-log.info START SLAVE IO_THREAD; include/wait_for_slave_io_to_start.inc diff --git a/mysql-test/suite/rpl/r/rpl_read_old_relay_log_info.result b/mysql-test/suite/rpl/r/rpl_read_old_relay_log_info.result index 217bc726e0e..151a00a514b 100644 --- a/mysql-test/suite/rpl/r/rpl_read_old_relay_log_info.result +++ b/mysql-test/suite/rpl/r/rpl_read_old_relay_log_info.result @@ -6,7 +6,7 @@ DROP TABLE t1; connection slave; ==== Check that we still understand the old format of relay-log.info ==== include/stop_slave.inc -RESET SLAVE; +include/reset_slave.inc # Read relay-log.info START SLAVE IO_THREAD; include/wait_for_slave_io_to_start.inc diff --git a/mysql-test/suite/rpl/r/rpl_reset_slave_fail.result b/mysql-test/suite/rpl/r/rpl_reset_slave_fail.result index 34ce68cb079..ff2da0a900a 100644 --- a/mysql-test/suite/rpl/r/rpl_reset_slave_fail.result +++ b/mysql-test/suite/rpl/r/rpl_reset_slave_fail.result @@ -22,7 +22,7 @@ START SLAVE; ERROR HY000: Could not initialize master info structure for ''; more error messages can be found in the MariaDB error log START SLAVE; ERROR HY000: Could not initialize master info structure for ''; more error messages can be found in the MariaDB error log -RESET SLAVE; +include/reset_slave.inc DROP TABLE t1; START SLAVE UNTIL MASTER_LOG_FILE= 'MASTER_LOG_FILE', MASTER_LOG_POS= MASTER_LOG_POS;; include/wait_for_slave_sql_to_stop.inc diff --git a/mysql-test/suite/rpl/r/rpl_row_001.result b/mysql-test/suite/rpl/r/rpl_row_001.result index 976ac0996bf..926404d29be 100644 --- a/mysql-test/suite/rpl/r/rpl_row_001.result +++ b/mysql-test/suite/rpl/r/rpl_row_001.result @@ -6,7 +6,7 @@ connection master; RESET MASTER; connection slave; STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc connection master; SELECT COUNT(*) FROM t1; COUNT(*) diff --git a/mysql-test/suite/rpl/r/rpl_row_colSize.result b/mysql-test/suite/rpl/r/rpl_row_colSize.result index 748d83a7f8e..dbfb9325f9c 100644 --- a/mysql-test/suite/rpl/r/rpl_row_colSize.result +++ b/mysql-test/suite/rpl/r/rpl_row_colSize.result @@ -11,7 +11,7 @@ Warnings: Note 1051 Unknown table 'test.t1' connection slave; STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc CREATE TABLE t1 (a DECIMAL(5,2)); connection master; CREATE TABLE t1 (a DECIMAL(20, 10)); @@ -25,7 +25,9 @@ SELECT COUNT(*) FROM t1; COUNT(*) 0 STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' connection master; RESET MASTER; connection slave; @@ -34,7 +36,9 @@ connection master; DROP TABLE IF EXISTS t1; connection slave; STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' CREATE TABLE t1 (a DECIMAL(27, 9)); connection master; CREATE TABLE t1 (a DECIMAL(27, 18)); @@ -48,7 +52,9 @@ SELECT COUNT(*) FROM t1; COUNT(*) 0 STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' connection master; RESET MASTER; connection slave; @@ -57,7 +63,9 @@ connection master; DROP TABLE IF EXISTS t1; connection slave; STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' CREATE TABLE t1 (a NUMERIC(5,2)); connection master; CREATE TABLE t1 (a NUMERIC(20, 10)); @@ -71,7 +79,9 @@ SELECT COUNT(*) FROM t1; COUNT(*) 0 STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' connection master; RESET MASTER; connection slave; @@ -81,7 +91,9 @@ connection master; DROP TABLE IF EXISTS t1; connection slave; STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' CREATE TABLE t1 (a FLOAT(20)); connection master; CREATE TABLE t1 (a FLOAT(47)); @@ -95,7 +107,9 @@ SELECT COUNT(*) FROM t1; COUNT(*) 0 STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' connection master; RESET MASTER; connection slave; @@ -105,7 +119,9 @@ connection master; DROP TABLE IF EXISTS t1; connection slave; STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' CREATE TABLE t1 (a BIT(5)); connection master; CREATE TABLE t1 (a BIT(64)); @@ -119,7 +135,9 @@ SELECT COUNT(*) FROM t1; COUNT(*) 0 STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' connection master; RESET MASTER; connection slave; @@ -128,7 +146,9 @@ connection master; DROP TABLE IF EXISTS t1; connection slave; STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' CREATE TABLE t1 (a BIT(11)); connection master; CREATE TABLE t1 (a BIT(12)); @@ -142,7 +162,9 @@ SELECT COUNT(*) FROM t1; COUNT(*) 0 STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' connection master; RESET MASTER; connection slave; @@ -152,7 +174,9 @@ connection master; DROP TABLE IF EXISTS t1; connection slave; STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' CREATE TABLE t1 (a SET('4')); connection master; CREATE TABLE t1 (a SET('1','2','3','4','5','6','7','8','9')); @@ -166,7 +190,9 @@ SELECT COUNT(*) FROM t1; COUNT(*) 0 STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' connection master; RESET MASTER; connection slave; @@ -176,7 +202,9 @@ connection master; DROP TABLE IF EXISTS t1; connection slave; STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' CREATE TABLE t1 (a CHAR(10)); connection master; CREATE TABLE t1 (a CHAR(20)); @@ -190,7 +218,9 @@ SELECT COUNT(*) FROM t1; COUNT(*) 0 STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' connection master; RESET MASTER; connection slave; @@ -200,7 +230,9 @@ connection master; DROP TABLE IF EXISTS t1; connection slave; STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' CREATE TABLE t1 (a ENUM('44','54')); connection master; CREATE TABLE t1 (a ENUM( @@ -245,7 +277,9 @@ SELECT COUNT(*) FROM t1; COUNT(*) 0 STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' connection master; RESET MASTER; connection slave; @@ -255,7 +289,9 @@ connection master; DROP TABLE IF EXISTS t1; connection slave; STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' CREATE TABLE t1 (a VARCHAR(100)); connection master; CREATE TABLE t1 (a VARCHAR(2000)); @@ -269,7 +305,9 @@ SELECT COUNT(*) FROM t1; COUNT(*) 0 STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' connection master; RESET MASTER; connection slave; @@ -278,7 +316,9 @@ connection master; DROP TABLE IF EXISTS t1; connection slave; STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' CREATE TABLE t1 (a VARCHAR(10)); connection master; CREATE TABLE t1 (a VARCHAR(200)); @@ -292,7 +332,9 @@ SELECT COUNT(*) FROM t1; COUNT(*) 0 STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' connection master; RESET MASTER; connection slave; @@ -301,7 +343,9 @@ connection master; DROP TABLE IF EXISTS t1; connection slave; STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' CREATE TABLE t1 (a VARCHAR(1000)); connection master; CREATE TABLE t1 (a VARCHAR(2000)); @@ -315,7 +359,9 @@ SELECT COUNT(*) FROM t1; COUNT(*) 0 STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' connection master; RESET MASTER; connection slave; @@ -325,7 +371,9 @@ connection master; DROP TABLE IF EXISTS t1; connection slave; STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' CREATE TABLE t1 (a TINYBLOB); connection master; CREATE TABLE t1 (a LONGBLOB); @@ -339,7 +387,9 @@ SELECT COUNT(*) FROM t1; COUNT(*) 0 STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' connection master; RESET MASTER; connection slave; diff --git a/mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result b/mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result index 660c736795b..8ce08e9d550 100644 --- a/mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result +++ b/mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result @@ -1,5 +1,10 @@ include/master-slave.inc [connection master] +connection slave; +include/stop_slave.inc +change master to master_use_gtid=no; +include/start_slave.inc +connection master; create table t1 (a int) ENGINE=MyISAM; insert into t1 values (10); create table t2 (a int) ENGINE=MyISAM; diff --git a/mysql-test/suite/rpl/r/rpl_row_loaddata_concurrent.result b/mysql-test/suite/rpl/r/rpl_row_loaddata_concurrent.result index 0704f5c69a1..bf63dc57c4b 100644 --- a/mysql-test/suite/rpl/r/rpl_row_loaddata_concurrent.result +++ b/mysql-test/suite/rpl/r/rpl_row_loaddata_concurrent.result @@ -75,7 +75,9 @@ load data CONCURRENT infile '../../std_data/rpl_loaddata.dat' into table t1; connection slave; include/wait_for_slave_sql_error.inc [errno=1062] stop slave; -reset slave; +include/reset_slave.inc +Warnings: +Warning 1948 Specified value for @@gtid_slave_pos contains no value for replication domain 0. This conflicts with the binary log which contains GTID 0-2-11. If MASTER_GTID_POS=CURRENT_POS is used, the binlog position will override the new value of @@gtid_slave_pos include/check_slave_no_error.inc connection master; reset master; diff --git a/mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result b/mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result index 83f16122d96..67251e2ef72 100644 --- a/mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result +++ b/mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result @@ -91,7 +91,7 @@ include/wait_for_slave_to_stop.inc connection master; reset master; connection slave; -reset slave; +include/reset_slave.inc start slave; include/wait_for_slave_to_start.inc connection master; @@ -168,7 +168,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -191,7 +191,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -221,7 +221,7 @@ include/wait_for_slave_to_stop.inc connection master; reset master; connection slave; -reset slave; +include/reset_slave.inc start slave; include/wait_for_slave_to_start.inc connection master; @@ -306,7 +306,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -335,7 +335,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -356,7 +356,7 @@ include/wait_for_slave_to_stop.inc connection master; reset master; connection slave; -reset slave; +include/reset_slave.inc start slave; include/wait_for_slave_to_start.inc connection master; diff --git a/mysql-test/suite/rpl/r/rpl_row_reset_slave.result b/mysql-test/suite/rpl/r/rpl_row_reset_slave.result index b9e98d5a97d..5e595447e50 100644 --- a/mysql-test/suite/rpl/r/rpl_row_reset_slave.result +++ b/mysql-test/suite/rpl/r/rpl_row_reset_slave.result @@ -7,7 +7,7 @@ include/stop_slave.inc change master to master_user='test'; Master_User = 'test' Master_Host = '127.0.0.1' -reset slave; +include/reset_slave.inc Master_User = 'test' Master_Host = '127.0.0.1' change master to master_user='root'; @@ -15,13 +15,13 @@ include/start_slave.inc Master_User = 'root' Master_Host = '127.0.0.1' include/stop_slave.inc -reset slave; +include/reset_slave.inc include/start_slave.inc connection master; create temporary table t1 (a int); connection slave; include/stop_slave.inc -reset slave; +include/reset_slave.inc include/start_slave.inc show status like 'slave_open_temp_tables'; Variable_name Value @@ -30,7 +30,7 @@ connection master; drop temporary table if exists t1; connection slave; include/stop_slave.inc -reset slave; +include/reset_slave.inc include/check_slave_no_error.inc change master to master_user='impossible_user_name'; start slave; @@ -44,13 +44,14 @@ change master to master_user='impossible_user_name'; start slave; include/wait_for_slave_io_error.inc [errno=1045] include/stop_slave_sql.inc -reset slave; +include/reset_slave.inc include/check_slave_no_error.inc change master to master_user='root'; -reset slave; +include/reset_slave.inc include/start_slave.inc include/stop_slave.inc reset slave all; +set @@global.gtid_slave_pos= ""; start slave; ERROR HY000: Misconfigured slave: MASTER_HOST was not set; Fix in config file or with CHANGE MASTER TO CHANGE MASTER TO MASTER_HOST= 'MASTER_HOST', MASTER_USER= 'MASTER_USER', MASTER_PORT= MASTER_PORT; diff --git a/mysql-test/suite/rpl/r/rpl_row_until.result b/mysql-test/suite/rpl/r/rpl_row_until.result index 82268ce72eb..8ef10bf47b5 100644 --- a/mysql-test/suite/rpl/r/rpl_row_until.result +++ b/mysql-test/suite/rpl/r/rpl_row_until.result @@ -10,7 +10,7 @@ INSERT INTO t2 VALUES (3),(4); DROP TABLE t2; connection slave; include/stop_slave.inc -RESET SLAVE; +include/reset_slave.inc CHANGE MASTER TO MASTER_USER='root', MASTER_CONNECT_RETRY=1, MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_MYPORT; connection slave; START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=master_pos_drop_t1; @@ -52,7 +52,7 @@ START SLAVE UNTIL RELAY_LOG_FILE='slave-relay-bin.000002', MASTER_LOG_POS=MASTER ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=MASTER_LOG_POS; include/stop_slave.inc -RESET SLAVE; +include/reset_slave.inc include/start_slave.inc include/rpl_reset.inc connection master; diff --git a/mysql-test/suite/rpl/r/rpl_seconds_behind_master_spike.result b/mysql-test/suite/rpl/r/rpl_seconds_behind_master_spike.result index 4eeb863bb40..eeafd679187 100644 --- a/mysql-test/suite/rpl/r/rpl_seconds_behind_master_spike.result +++ b/mysql-test/suite/rpl/r/rpl_seconds_behind_master_spike.result @@ -2,6 +2,9 @@ include/master-slave.inc [connection master] connection slave; include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc +include/stop_slave.inc SET @save_dbug= @@GLOBAL.debug_dbug; SET @@global.debug_dbug="+d,pause_sql_thread_on_fde"; include/start_slave.inc diff --git a/mysql-test/suite/rpl/r/rpl_semi_sync.result b/mysql-test/suite/rpl/r/rpl_semi_sync.result index d18bd1efda7..edd5e7748e0 100644 --- a/mysql-test/suite/rpl/r/rpl_semi_sync.result +++ b/mysql-test/suite/rpl/r/rpl_semi_sync.result @@ -6,16 +6,18 @@ call mtr.add_suppression("Read semi-sync reply"); call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT."); call mtr.add_suppression("mysqld: Got an error reading communication packets"); connection slave; +set sql_log_bin=0; call mtr.add_suppression("Master server does not support semi-sync"); call mtr.add_suppression("Semi-sync slave .* reply"); call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group"); +set sql_log_bin=1; connection master; # # Uninstall semi-sync plugins on master and slave # connection slave; include/stop_slave.inc -reset slave; +include/reset_slave.inc set global rpl_semi_sync_master_enabled= 0; set global rpl_semi_sync_slave_enabled= 0; connection master; @@ -310,7 +312,7 @@ Variable_name Value Rpl_semi_sync_master_yes_tx 0 connection slave; include/stop_slave.inc -reset slave; +include/reset_slave.inc include/kill_binlog_dump_threads.inc connection slave; include/start_slave.inc @@ -340,7 +342,7 @@ Rpl_semi_sync_master_yes_tx 3 # connection slave; include/stop_slave.inc -reset slave; +include/reset_slave.inc connection master; reset master; include/kill_binlog_dump_threads.inc diff --git a/mysql-test/suite/rpl/r/rpl_semi_sync_after_sync.result b/mysql-test/suite/rpl/r/rpl_semi_sync_after_sync.result index f2240817489..7341eb547f3 100644 --- a/mysql-test/suite/rpl/r/rpl_semi_sync_after_sync.result +++ b/mysql-test/suite/rpl/r/rpl_semi_sync_after_sync.result @@ -7,16 +7,18 @@ call mtr.add_suppression("Read semi-sync reply"); call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT."); call mtr.add_suppression("mysqld: Got an error reading communication packets"); connection slave; +set sql_log_bin=0; call mtr.add_suppression("Master server does not support semi-sync"); call mtr.add_suppression("Semi-sync slave .* reply"); call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group"); +set sql_log_bin=1; connection master; # # Uninstall semi-sync plugins on master and slave # connection slave; include/stop_slave.inc -reset slave; +include/reset_slave.inc set global rpl_semi_sync_master_enabled= 0; set global rpl_semi_sync_slave_enabled= 0; connection master; @@ -311,7 +313,7 @@ Variable_name Value Rpl_semi_sync_master_yes_tx 0 connection slave; include/stop_slave.inc -reset slave; +include/reset_slave.inc include/kill_binlog_dump_threads.inc connection slave; include/start_slave.inc @@ -341,7 +343,7 @@ Rpl_semi_sync_master_yes_tx 3 # connection slave; include/stop_slave.inc -reset slave; +include/reset_slave.inc connection master; reset master; include/kill_binlog_dump_threads.inc diff --git a/mysql-test/suite/rpl/r/rpl_semi_sync_after_sync_row.result b/mysql-test/suite/rpl/r/rpl_semi_sync_after_sync_row.result index fcced801d65..d75a3a2c9b7 100644 --- a/mysql-test/suite/rpl/r/rpl_semi_sync_after_sync_row.result +++ b/mysql-test/suite/rpl/r/rpl_semi_sync_after_sync_row.result @@ -7,16 +7,18 @@ call mtr.add_suppression("Read semi-sync reply"); call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT."); call mtr.add_suppression("mysqld: Got an error reading communication packets"); connection slave; +set sql_log_bin=0; call mtr.add_suppression("Master server does not support semi-sync"); call mtr.add_suppression("Semi-sync slave .* reply"); call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group"); +set sql_log_bin=1; connection master; # # Uninstall semi-sync plugins on master and slave # connection slave; include/stop_slave.inc -reset slave; +include/reset_slave.inc set global rpl_semi_sync_master_enabled= 0; set global rpl_semi_sync_slave_enabled= 0; connection master; @@ -311,7 +313,7 @@ Variable_name Value Rpl_semi_sync_master_yes_tx 0 connection slave; include/stop_slave.inc -reset slave; +include/reset_slave.inc include/kill_binlog_dump_threads.inc connection slave; include/start_slave.inc @@ -341,7 +343,7 @@ Rpl_semi_sync_master_yes_tx 3 # connection slave; include/stop_slave.inc -reset slave; +include/reset_slave.inc connection master; reset master; include/kill_binlog_dump_threads.inc diff --git a/mysql-test/suite/rpl/r/rpl_server_id2.result b/mysql-test/suite/rpl/r/rpl_server_id2.result index 74145645920..3d8eeb02ca6 100644 --- a/mysql-test/suite/rpl/r/rpl_server_id2.result +++ b/mysql-test/suite/rpl/r/rpl_server_id2.result @@ -1,6 +1,9 @@ include/master-slave.inc [connection master] connection slave; +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc create table t1 (n int); reset master; stop slave; diff --git a/mysql-test/suite/rpl/r/rpl_server_id_ignore.result b/mysql-test/suite/rpl/r/rpl_server_id_ignore.result index 22f739d1ec0..3c7f2950d16 100644 --- a/mysql-test/suite/rpl/r/rpl_server_id_ignore.result +++ b/mysql-test/suite/rpl/r/rpl_server_id_ignore.result @@ -11,7 +11,7 @@ ignore server id list: change master to IGNORE_SERVER_IDS= (10, 100); *** must be 10, 100 *** ignore server id list: 10, 100 -reset slave; +include/reset_slave.inc *** must be empty due to reset slave *** ignore server id list: 10, 100 change master to IGNORE_SERVER_IDS= (10, 100); @@ -33,7 +33,7 @@ Tables_in_test *** allowing events from master *** stop slave; include/wait_for_slave_to_stop.inc -reset slave; +include/reset_slave.inc change master to IGNORE_SERVER_IDS= (10, 100); *** the list must remain (10, 100) after reset slave *** change master to IGNORE_SERVER_IDS= (); diff --git a/mysql-test/suite/rpl/r/rpl_skip_replication.result b/mysql-test/suite/rpl/r/rpl_skip_replication.result index 59d5b50e5cc..96e0a30331d 100644 --- a/mysql-test/suite/rpl/r/rpl_skip_replication.result +++ b/mysql-test/suite/rpl/r/rpl_skip_replication.result @@ -1,6 +1,11 @@ include/master-slave.inc [connection master] connection slave; +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc +connection master; +connection slave; CREATE USER 'nonsuperuser'@'127.0.0.1'; GRANT ALTER,CREATE,DELETE,DROP,EVENT,INSERT,PROCESS,REPLICATION SLAVE, SELECT,UPDATE ON *.* TO 'nonsuperuser'@'127.0.0.1'; diff --git a/mysql-test/suite/rpl/r/rpl_slave_alias_replica.result b/mysql-test/suite/rpl/r/rpl_slave_alias_replica.result index 2a49e80075f..0ede17132df 100644 --- a/mysql-test/suite/rpl/r/rpl_slave_alias_replica.result +++ b/mysql-test/suite/rpl/r/rpl_slave_alias_replica.result @@ -30,6 +30,7 @@ include/wait_for_slave_io_to_stop.inc include/wait_for_slave_sql_to_stop.inc "Command: RESET SLAVE ALL --> RESET REPLICA ALL" RESET REPLICA ALL; +set @@global.gtid_slave_pos= ""; connection master; RESET MASTER; CREATE TABLE t(f INT) ENGINE=INNODB; diff --git a/mysql-test/suite/rpl/r/rpl_slave_max_statement_time.result b/mysql-test/suite/rpl/r/rpl_slave_max_statement_time.result new file mode 100644 index 00000000000..0314797f6be --- /dev/null +++ b/mysql-test/suite/rpl/r/rpl_slave_max_statement_time.result @@ -0,0 +1,170 @@ +include/master-slave.inc +[connection master] +# +# Set up +# +connection master; +SET STATEMENT sql_log_bin=0 FOR CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format"); +SET STATEMENT sql_log_bin=0 FOR CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format"); +connection slave; +SET STATEMENT sql_log_bin=0 FOR CALL mtr.add_suppression("Slave log event execution was interrupted"); +SET STATEMENT sql_log_bin=0 FOR CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format"); +SET @save_slave_max_statement_time=@@GLOBAL.slave_max_statement_time; +# +# Test Case 1) Using a serial slave, the SQL thread should time out when +# its underlying event executes for longer than @@slave_max_statement_time. +# +connection master; +create table t1(a int not null auto_increment, b int, primary key(a)) engine=InnoDB; +include/save_master_gtid.inc +connection slave; +include/sync_with_master_gtid.inc +include/stop_slave.inc +SET @old_slave_max_statement_time=@@GLOBAL.slave_max_statement_time; +SET GLOBAL slave_max_statement_time=0.75; +connection master; +# Long running command due to a lock conflict +INSERT INTO t1(b) VALUES (1); +include/save_master_gtid.inc +connection slave1; +BEGIN; +INSERT INTO t1(b) VALUES (1); +connection slave; +# Starting slave to receive event which will take longer to execute +# than slave_max_statement_time +START SLAVE; +include/wait_for_slave_sql_error.inc [errno=4192] +# Ensuring event was not processed.. +# ..success +# Remove slave timeout and catch up to master +SET GLOBAL slave_max_statement_time=0; +connection slave1; +ROLLBACK; +include/start_slave.inc +include/sync_with_master_gtid.inc +# Test case cleanup +connection master; +DROP TABLE t1; +include/save_master_gtid.inc +connection slave; +include/sync_with_master_gtid.inc +include/stop_slave.inc +SET GLOBAL slave_max_statement_time=@old_slave_max_statement_time; +include/start_slave.inc +# +# Test Case 2) Using a parallel slave, a worker thread should time out +# when its underlying event executes for longer than +# @@slave_max_statement_time +# +include/stop_slave.inc +SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; +SET @old_parallel_mode=@@GLOBAL.slave_parallel_mode; +SET GLOBAL slave_parallel_threads=2; +SET GLOBAL slave_parallel_mode='optimistic'; +include/start_slave.inc +connection master; +create table t1(a int not null auto_increment, b int, primary key(a)) engine=InnoDB; +include/save_master_gtid.inc +connection slave; +include/sync_with_master_gtid.inc +include/stop_slave.inc +SET @old_slave_max_statement_time=@@GLOBAL.slave_max_statement_time; +SET GLOBAL slave_max_statement_time=0.75; +connection master; +# Long running command due to a lock conflict +INSERT INTO t1(b) VALUES (1); +include/save_master_gtid.inc +connection slave1; +BEGIN; +INSERT INTO t1(b) VALUES (1); +connection slave; +# Starting slave to receive event which will take longer to execute +# than slave_max_statement_time +START SLAVE; +include/wait_for_slave_sql_error.inc [errno=4192] +# Ensuring event was not processed.. +# ..success +# Remove slave timeout and catch up to master +SET GLOBAL slave_max_statement_time=0; +connection slave1; +ROLLBACK; +include/start_slave.inc +include/sync_with_master_gtid.inc +# Test case cleanup +connection master; +DROP TABLE t1; +include/save_master_gtid.inc +connection slave; +include/sync_with_master_gtid.inc +include/stop_slave.inc +SET GLOBAL slave_max_statement_time=@old_slave_max_statement_time; +include/start_slave.inc +include/stop_slave.inc +SET GLOBAL slave_parallel_mode=@old_parallel_mode; +SET GLOBAL slave_parallel_threads=@old_parallel_threads; +include/start_slave.inc +# +# Test Case 3) Load-based log events (from LOAD DATA INFILE) should time +# out if their execution time exceeds @@slave_max_statement_time +# +connection master; +create table t1(a int not null auto_increment, b int, primary key(a)) engine=InnoDB; +include/save_master_gtid.inc +connection slave; +include/sync_with_master_gtid.inc +include/stop_slave.inc +SET @old_slave_max_statement_time=@@GLOBAL.slave_max_statement_time; +SET GLOBAL slave_max_statement_time=0.75; +connection master; +# Long running command due to a lock conflict +load data infile '../../std_data/rpl_loaddata.dat' into table t1; +include/save_master_gtid.inc +connection slave1; +BEGIN; +INSERT INTO t1(b) VALUES (1); +connection slave; +# Starting slave to receive event which will take longer to execute +# than slave_max_statement_time +START SLAVE; +include/wait_for_slave_sql_error.inc [errno=4192] +# Ensuring event was not processed.. +# ..success +# Remove slave timeout and catch up to master +SET GLOBAL slave_max_statement_time=0; +connection slave1; +ROLLBACK; +include/start_slave.inc +include/sync_with_master_gtid.inc +# Test case cleanup +connection master; +DROP TABLE t1; +include/save_master_gtid.inc +connection slave; +include/sync_with_master_gtid.inc +include/stop_slave.inc +SET GLOBAL slave_max_statement_time=@old_slave_max_statement_time; +include/start_slave.inc +# +# Test Case 4) Locally executed long running statements should not time +# out due to @@slave_max_statement_time +# +connection slave; +include/stop_slave.inc +SET @old_slave_max_statement_time=@@GLOBAL.slave_max_statement_time; +SET @old_gtid_domain_id=@@GLOBAL.gtid_domain_id; +SET @@GLOBAL.slave_max_statement_time=0.75; +SET @@GLOBAL.gtid_domain_id=1; +include/start_slave.inc +CREATE TABLE t2 (a int); +SET STATEMENT sql_log_bin=0 FOR INSERT INTO t2 SELECT SLEEP(1); +DROP TABLE t2; +include/stop_slave.inc +SET GLOBAL gtid_domain_id=@old_gtid_domain_id; +SET GLOBAL slave_max_statement_time=@old_slave_max_statement_time; +include/start_slave.inc +# Cleanup +include/stop_slave.inc +SET GLOBAL slave_max_statement_time=@save_slave_max_statement_time; +include/start_slave.inc +include/rpl_end.inc +# End of rpl_slave_max_statement_time.test diff --git a/mysql-test/suite/rpl/r/rpl_slave_skip.result b/mysql-test/suite/rpl/r/rpl_slave_skip.result index b9fe6842a11..8896199f499 100644 --- a/mysql-test/suite/rpl/r/rpl_slave_skip.result +++ b/mysql-test/suite/rpl/r/rpl_slave_skip.result @@ -63,7 +63,7 @@ c d 3 27 STOP SLAVE; include/wait_for_slave_to_stop.inc -RESET SLAVE; +include/reset_slave.inc connection master; RESET MASTER; SET SESSION BINLOG_FORMAT=STATEMENT; diff --git a/mysql-test/suite/rpl/r/rpl_sp.result b/mysql-test/suite/rpl/r/rpl_sp.result index 0bb3d9dc52a..55a826b3213 100644 --- a/mysql-test/suite/rpl/r/rpl_sp.result +++ b/mysql-test/suite/rpl/r/rpl_sp.result @@ -784,7 +784,7 @@ DELIMITER /*!*/; ROLLBACK/*!*/; SET TIMESTAMP=t/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/rpl/r/rpl_start_alter_mysqlbinlog_1.result b/mysql-test/suite/rpl/r/rpl_start_alter_mysqlbinlog_1.result index e008bbc81a7..bf9d9be0ec6 100644 --- a/mysql-test/suite/rpl/r/rpl_start_alter_mysqlbinlog_1.result +++ b/mysql-test/suite/rpl/r/rpl_start_alter_mysqlbinlog_1.result @@ -4,7 +4,6 @@ connection master; set global binlog_alter_two_phase=true; connection slave; include/stop_slave.inc -change master to master_use_gtid= current_pos; set global gtid_strict_mode=1; # Legacy Master Slave connect master_node,127.0.0.1,root,,$db_name, $M_port; diff --git a/mysql-test/suite/rpl/r/rpl_start_alter_options.result b/mysql-test/suite/rpl/r/rpl_start_alter_options.result index 30854b12be1..4c6135aaf5e 100644 --- a/mysql-test/suite/rpl/r/rpl_start_alter_options.result +++ b/mysql-test/suite/rpl/r/rpl_start_alter_options.result @@ -3,6 +3,8 @@ include/master-slave.inc connection slave; stop slave; change master to master_use_gtid= current_pos; +Warnings: +Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead SET GLOBAL slave_parallel_threads=4; set global slave_parallel_mode=optimistic; set global gtid_strict_mode=1; @@ -94,6 +96,8 @@ include/start_slave.inc connection slave; stop slave; change master to master_use_gtid= current_pos; +Warnings: +Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead SET GLOBAL slave_parallel_threads=4; set global slave_parallel_mode=optimistic; set global gtid_strict_mode=1; @@ -185,6 +189,8 @@ include/start_slave.inc connection slave; stop slave; change master to master_use_gtid= current_pos; +Warnings: +Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead SET GLOBAL slave_parallel_threads=4; set global slave_parallel_mode=optimistic; set global gtid_strict_mode=1; @@ -315,6 +321,8 @@ include/start_slave.inc connection slave; stop slave; change master to master_use_gtid= current_pos; +Warnings: +Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead SET GLOBAL slave_parallel_threads=4; set global slave_parallel_mode=optimistic; set global gtid_strict_mode=1; @@ -406,6 +414,8 @@ include/start_slave.inc connection slave; stop slave; change master to master_use_gtid= current_pos; +Warnings: +Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead SET GLOBAL slave_parallel_threads=4; set global slave_parallel_mode=optimistic; set global gtid_strict_mode=1; diff --git a/mysql-test/suite/rpl/r/rpl_start_alter_restart_master.result b/mysql-test/suite/rpl/r/rpl_start_alter_restart_master.result index a2aba33aee0..2b53fde52a7 100644 --- a/mysql-test/suite/rpl/r/rpl_start_alter_restart_master.result +++ b/mysql-test/suite/rpl/r/rpl_start_alter_restart_master.result @@ -1,6 +1,10 @@ include/master-slave.inc [connection master] connection slave; +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc +connection slave; SET @old_debug_slave= @@global.debug; stop slave; SET GLOBAL slave_parallel_threads=4; diff --git a/mysql-test/suite/rpl/r/rpl_stm_000001.result b/mysql-test/suite/rpl/r/rpl_stm_000001.result index 9ef2ca3bc53..5d6d61d175b 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_000001.result +++ b/mysql-test/suite/rpl/r/rpl_stm_000001.result @@ -49,7 +49,7 @@ connection master; reset master; connection slave; stop slave; -reset slave; +include/reset_slave.inc connection master; connection slave; lock tables t1 read; diff --git a/mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result b/mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result index 944ad9331ad..e94e097f41f 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result +++ b/mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result @@ -1,5 +1,10 @@ include/master-slave.inc [connection master] +connection slave; +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc +connection master; call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); call mtr.add_suppression("Write to binary log failed: Multi-row statements required more than .max_binlog_stmt_cache_size"); call mtr.add_suppression("Write to binary log failed: Multi-statement transaction required more than .max_binlog_cache_size"); diff --git a/mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result b/mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result index 660c736795b..8ce08e9d550 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result +++ b/mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result @@ -1,5 +1,10 @@ include/master-slave.inc [connection master] +connection slave; +include/stop_slave.inc +change master to master_use_gtid=no; +include/start_slave.inc +connection master; create table t1 (a int) ENGINE=MyISAM; insert into t1 values (10); create table t2 (a int) ENGINE=MyISAM; diff --git a/mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result b/mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result index f510eae74f8..a437b66dd78 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result +++ b/mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result @@ -74,7 +74,9 @@ load data CONCURRENT infile '../../std_data/rpl_loaddata.dat' into table t1; connection slave; include/wait_for_slave_sql_error.inc [errno=1062] stop slave; -reset slave; +include/reset_slave.inc +Warnings: +Warning 1948 Specified value for @@gtid_slave_pos contains no value for replication domain 0. This conflicts with the binary log which contains GTID 0-2-14. If MASTER_GTID_POS=CURRENT_POS is used, the binlog position will override the new value of @@gtid_slave_pos include/check_slave_no_error.inc connection master; reset master; diff --git a/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result b/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result index 1ba2d1b624b..0a365b30b38 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result +++ b/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result @@ -7,7 +7,7 @@ include/stop_slave.inc change master to master_user='test'; Master_User = 'test' Master_Host = '127.0.0.1' -reset slave; +include/reset_slave.inc Master_User = 'test' Master_Host = '127.0.0.1' change master to master_user='root'; @@ -15,13 +15,13 @@ include/start_slave.inc Master_User = 'root' Master_Host = '127.0.0.1' include/stop_slave.inc -reset slave; +include/reset_slave.inc include/start_slave.inc connection master; create temporary table t1 (a int); connection slave; include/stop_slave.inc -reset slave; +include/reset_slave.inc include/start_slave.inc show status like 'slave_open_temp_tables'; Variable_name Value @@ -30,7 +30,7 @@ connection master; drop temporary table if exists t1; connection slave; include/stop_slave.inc -reset slave; +include/reset_slave.inc include/check_slave_no_error.inc change master to master_user='impossible_user_name'; start slave; @@ -44,13 +44,14 @@ change master to master_user='impossible_user_name'; start slave; include/wait_for_slave_io_error.inc [errno=1045] include/stop_slave_sql.inc -reset slave; +include/reset_slave.inc include/check_slave_no_error.inc change master to master_user='root'; -reset slave; +include/reset_slave.inc include/start_slave.inc include/stop_slave.inc reset slave all; +set @@global.gtid_slave_pos= ""; start slave; ERROR HY000: Misconfigured slave: MASTER_HOST was not set; Fix in config file or with CHANGE MASTER TO CHANGE MASTER TO MASTER_HOST= 'MASTER_HOST', MASTER_USER= 'MASTER_USER', MASTER_PORT= MASTER_PORT; diff --git a/mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result b/mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result index 992e6c2181b..40910b8c1f2 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result +++ b/mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result @@ -104,13 +104,15 @@ connection master; RESET MASTER; connection slave; include/stop_slave.inc -CHANGE MASTER TO master_log_pos=MASTER_POS; +CHANGE MASTER TO master_log_pos=MASTER_POS, master_use_gtid=no; START SLAVE; include/wait_for_slave_param.inc [Last_IO_Errno] Last_IO_Errno = '1236' Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'Client requested master to start replication from impossible position; the first event 'master-bin.000001' at XXX, the last event read from 'master-bin.000001' at XXX, the last byte read from 'master-bin.000001' at XXX.'' include/stop_slave.inc RESET SLAVE; +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' connection master; RESET MASTER; connection slave; diff --git a/mysql-test/suite/rpl/r/rpl_stm_until.result b/mysql-test/suite/rpl/r/rpl_stm_until.result index 65f188c11a0..b51e3d847e3 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_until.result +++ b/mysql-test/suite/rpl/r/rpl_stm_until.result @@ -69,7 +69,9 @@ Note 1254 Slave is already running connection slave; include/stop_slave.inc drop table if exists t1; -reset slave; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root'; connection master; drop table if exists t1; diff --git a/mysql-test/suite/rpl/r/rpl_stop_slave.result b/mysql-test/suite/rpl/r/rpl_stop_slave.result index a4dbf13290a..50a52d4d4b3 100644 --- a/mysql-test/suite/rpl/r/rpl_stop_slave.result +++ b/mysql-test/suite/rpl/r/rpl_stop_slave.result @@ -1,5 +1,10 @@ include/master-slave.inc [connection master] +connection slave; +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc +connection master; # BUG#56118 STOP SLAVE does not wait till trx with CREATE TMP TABLE ends # diff --git a/mysql-test/suite/rpl/r/rpl_timestamp.result b/mysql-test/suite/rpl/r/rpl_timestamp.result index 5e38de40b42..d287bad4492 100644 --- a/mysql-test/suite/rpl/r/rpl_timestamp.result +++ b/mysql-test/suite/rpl/r/rpl_timestamp.result @@ -7,15 +7,15 @@ create table t1 (f1 timestamp, f2 timestamp); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `f1` timestamp NULL DEFAULT NULL, - `f2` timestamp NULL DEFAULT NULL + `f1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `f2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci connection slave; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `f1` timestamp NULL DEFAULT NULL, - `f2` timestamp NULL DEFAULT NULL + `f1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `f2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci connection master; drop table t1; @@ -28,7 +28,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1656940000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/rpl/r/rpl_trigger.result b/mysql-test/suite/rpl/r/rpl_trigger.result index 06d5a3c895f..f4f700ac477 100644 --- a/mysql-test/suite/rpl/r/rpl_trigger.result +++ b/mysql-test/suite/rpl/r/rpl_trigger.result @@ -1,5 +1,9 @@ include/master-slave.inc [connection master] +connection slave; +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc connection master; DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t2; @@ -961,7 +965,9 @@ include/rpl_stop_server.inc [server_number=1] include/rpl_start_server.inc [server_number=1] --> Master binlog: Server ver: 5.0.16-debug-log, Binlog ver: 4 connection slave; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' START SLAVE; SELECT MASTER_POS_WAIT('master-bin.000001', 513) >= 0; MASTER_POS_WAIT('master-bin.000001', 513) >= 0 @@ -992,7 +998,9 @@ DROP TRIGGER trg1; DROP TABLE t1; DROP TABLE t2; STOP SLAVE; -RESET SLAVE; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' connection master; SHOW TABLES LIKE 't_'; Tables_in_test (t_) @@ -1083,7 +1091,12 @@ drop table t1; connection slave; connection master; include/rpl_reset.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' connection slave; +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc connection master; create table t1 ( f int ) engine = innodb; create table log ( r int ) engine = myisam; diff --git a/mysql-test/suite/rpl/r/rpl_upgrade_master_info.result b/mysql-test/suite/rpl/r/rpl_upgrade_master_info.result index ffa041efd27..1babddf9a6e 100644 --- a/mysql-test/suite/rpl/r/rpl_upgrade_master_info.result +++ b/mysql-test/suite/rpl/r/rpl_upgrade_master_info.result @@ -3,7 +3,6 @@ include/master-slave.inc *** MDEV-9383: Server fails to read master.info after upgrade 10.0 -> 10.1 *** connection slave; include/stop_slave.inc -CHANGE MASTER TO master_use_gtid=CURRENT_POS; include/rpl_stop_server.inc [server_number=2] include/rpl_start_server.inc [server_number=2] connection master; diff --git a/mysql-test/suite/rpl/r/rpl_using_gtid_default.result b/mysql-test/suite/rpl/r/rpl_using_gtid_default.result new file mode 100644 index 00000000000..e077bcd91a4 --- /dev/null +++ b/mysql-test/suite/rpl/r/rpl_using_gtid_default.result @@ -0,0 +1,144 @@ +include/master-slave.inc +[connection master] +# +# Slave default configuration should be Slave_Pos +connection slave; +# +# Ensure that a slave configured with Using_Gtid=Slave_Pos will remain +# as Slave_Pos after RESET SLAVE +include/stop_slave.inc +RESET SLAVE; +# No warning should be given because Slave_Pos never changed +SHOW WARNINGS; +Level Code Message +include/start_slave.inc +# +# Ensure that a slave configured with Using_Gtid=No will revert to its +# default of Slave_Pos after RESET SLAVE for a master which supports +# GTIDs +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +include/start_slave.inc +include/stop_slave.inc +RESET SLAVE; +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' +# A notification that Using_Gtid was reverted should exist +SHOW WARNINGS; +Level Code Message +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' +include/start_slave.inc +# Clear SHOW WARNINGS +# +# If the primary does not support GTIDs (version < 10), the replica +# should fall back to Using_Gtid=No on slave start, and should not +# revert Using_Gtid to Slave_Pos after RESET SLAVE +include/stop_slave.inc +RESET SLAVE ALL; +CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_MYPORT, MASTER_USER='root', MASTER_CONNECT_RETRY=1; +SET @saved_dbug= @@GLOBAL.debug_dbug; +set @@global.debug_dbug= "d,mock_mariadb_primary_v5_in_get_master_version"; +include/start_slave.inc +# Replica should detect at start that the primary does not support GTIDs +# and fall-back to Using_Gtid=No +# Replica should have an informational message stating it is falling +# back to Using_Gtid=No +FOUND 1 /Falling back to Using_Gtid=No because master does not support GTIDs/ in mysqld.2.err +include/stop_slave.inc +RESET SLAVE; +# Replica should know that the primary does not support GTIDs and +# preserve Using_Gtid=No +# 'No' was not reverted and therefore no note should be added +SHOW WARNINGS; +Level Code Message +set @@global.debug_dbug= @saved_dbug; +include/start_slave.inc +# +# Ensure that a slave configured with Using_Gtid=Current_Pos will revert +# to its default of Slave_Pos after RESET SLAVE. +include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=Current_Pos; +Warnings: +Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead +include/start_slave.inc +include/stop_slave.inc +RESET SLAVE; +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'Current_Pos' to 'Slave_Pos' +# A notification that Using_Gtid was reverted should exist +SHOW WARNINGS; +Level Code Message +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'Current_Pos' to 'Slave_Pos' +include/start_slave.inc +# Clear SHOW WARNINGS +# The MTR include file rpl_change_topology.inc should implicitly set +# MASTER_USE_GTID=NO when provided with $rpl_master_log_file. Note that +# this will switch master and slave roles. +connection slave; +include/stop_slave.inc +include/rpl_change_topology.inc [new topology=2->1] +# connection 'master' is the slave in this comparison +connection master; +# Validating Using_Gtid=No.. +# ..success +include/rpl_change_topology.inc [new topology=1->2] +# connection 'slave' is back to slave role +connection slave; +# Validating Using_Gtid=Slave_Pos.. +# ..success +include/start_slave.inc +# +# The MTR include file reset_slave.inc should keep/delete GTID state +# when reset_slave_keep_gtid_state is set, respectively. +# +connection master; +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES (1); +DROP TABLE t1; +include/save_master_gtid.inc +connection slave; +include/sync_with_master_gtid.inc +include/stop_slave.inc +# Tagging gtid_slave_pos before reset_slave.inc as old_slave_pos +# Using reset_slave_keep_gtid_state=1 should preserve GTID state +include/reset_slave.inc +# Tagging gtid_slave_pos after reset_slave.inc as new_slave_pos +# Validating old_slave_pos == new_slave_pos.. +# ..success +# Using reset_slave_keep_gtid_state=0 should empty GTID state +include/reset_slave.inc +# Tagging gtid_slave_pos as new_slave_pos +# Validating new_slave_pos is empty.. +# ..success +set global gtid_slave_pos="old_slave_pos"; +include/start_slave.inc +# +# A replica issued CHANGE MASTER TO specified with log coordinates but +# not master_use_gtid=no should warn the user that Using_Gtid is being +# changed to No. +# +connection slave; +include/stop_slave.inc +CHANGE MASTER TO master_log_pos=io_log_pos, master_log_file='io_log_file'; +Warnings: +Note 4190 CHANGE MASTER TO is implicitly changing the value of 'Using_Gtid' from 'Slave_Pos' to 'No' +include/start_slave.inc +# +# A replica issued CHANGE MASTER TO specified with log coordinates and +# master_use_gtid=Slave_Pos should warn the user that the log +# coordinates will be ignored. +# +connection slave; +include/stop_slave.inc +CHANGE MASTER TO master_log_pos=io_log_pos, master_log_file='io_log_file', master_use_gtid=Slave_Pos; +Warnings: +Note 1618 <MASTER_LOG_FILE> option ignored +Note 1618 <MASTER_LOG_POS> option ignored +CHANGE MASTER TO relay_log_pos=relay_log_pos, relay_log_file='relay_log_file', master_use_gtid=Slave_Pos; +Warnings: +Note 1618 <RELAY_LOG_FILE> option ignored +Note 1618 <RELAY_LOG_POS> option ignored +include/start_slave.inc +include/rpl_end.inc +# +# End of rpl_using_gtid_default.test diff --git a/mysql-test/suite/rpl/r/rpl_xa_gap_lock.result b/mysql-test/suite/rpl/r/rpl_xa_gap_lock.result index cb760abe2d2..97e8f2105c4 100644 --- a/mysql-test/suite/rpl/r/rpl_xa_gap_lock.result +++ b/mysql-test/suite/rpl/r/rpl_xa_gap_lock.result @@ -38,7 +38,7 @@ include/diff_tables.inc [master:test.t1, slave:test.t1] include/diff_tables.inc [master:test.t2, slave:test.t2] DROP TABLE t2, t1; connection slave; -CHANGE MASTER TO MASTER_LOG_FILE='LOG_FILE', MASTER_LOG_POS=LOG_POS; +CHANGE MASTER TO MASTER_LOG_FILE='LOG_FILE', MASTER_LOG_POS=LOG_POS, MASTER_USE_GTID=NO; SET @@GLOBAL.innodb_limit_optimistic_insert_debug = @saved_innodb_limit_optimistic_insert_debug; include/start_slave.inc include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/semisync_future-7591.result b/mysql-test/suite/rpl/r/semisync_future-7591.result index 9dc0ee51e53..80414ac1f8d 100644 --- a/mysql-test/suite/rpl/r/semisync_future-7591.result +++ b/mysql-test/suite/rpl/r/semisync_future-7591.result @@ -6,7 +6,7 @@ set global rpl_semi_sync_master_enabled = ON; connection slave; include/stop_slave.inc set global rpl_semi_sync_slave_enabled = ON; -change master to master_log_file='master-bin.000002', master_log_pos = 320; +change master to master_log_file='master-bin.000002', master_log_pos = 320, master_use_gtid=no; start slave; include/wait_for_slave_io_error.inc [errno=1236] connection master; @@ -14,7 +14,9 @@ insert into t1 values (1); reset master; connection slave; include/stop_slave.inc -reset slave; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' include/start_slave.inc set global rpl_semi_sync_slave_enabled = OFF; connection master; diff --git a/mysql-test/suite/rpl/t/rpl_000010.test b/mysql-test/suite/rpl/t/rpl_000010.test index de6337dd723..9ff2d6c562d 100644 --- a/mysql-test/suite/rpl/t/rpl_000010.test +++ b/mysql-test/suite/rpl/t/rpl_000010.test @@ -3,6 +3,12 @@ source include/master-slave.inc; +--connection slave +--source include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +--source include/start_slave.inc +--connection master + create table t1 (n int not null auto_increment primary key); insert into t1 values(NULL); insert into t1 values(2); diff --git a/mysql-test/suite/rpl/t/rpl_binlog_dump_slave_gtid_state_info.test b/mysql-test/suite/rpl/t/rpl_binlog_dump_slave_gtid_state_info.test index f26e9565671..bba41295d16 100644 --- a/mysql-test/suite/rpl/t/rpl_binlog_dump_slave_gtid_state_info.test +++ b/mysql-test/suite/rpl/t/rpl_binlog_dump_slave_gtid_state_info.test @@ -8,7 +8,7 @@ # Steps: # 0 - Have LOG_WARNINGS=2 # 1 - On a fresh slave server which has not replicated any GTIDs execute -# "CHANGE MASTER TO MASTER_USE_GTID=current_pos;" command. Start the +# "CHANGE MASTER TO MASTER_USE_GTID=slave_pos;" command. Start the # slave. # 2 - In Master error log verify that pattern "using_gtid(1), gtid('')" is # present. @@ -43,7 +43,7 @@ SET GLOBAL LOG_WARNINGS=2; --connection slave --source include/stop_slave.inc -CHANGE MASTER TO MASTER_USE_GTID=current_pos; +CHANGE MASTER TO MASTER_USE_GTID=slave_pos; --source include/start_slave.inc --connection master diff --git a/mysql-test/suite/rpl/t/rpl_change_master.test b/mysql-test/suite/rpl/t/rpl_change_master.test index 9ab49a585e6..2758f9d6e27 100644 --- a/mysql-test/suite/rpl/t/rpl_change_master.test +++ b/mysql-test/suite/rpl/t/rpl_change_master.test @@ -108,4 +108,10 @@ CHANGE MASTER TO MASTER_USER='root', MASTER_SSL=0, MASTER_SSL_CA='', MASTER_SSL_ MASTER_SSL_KEY='', MASTER_SSL_CRL='', MASTER_SSL_CRLPATH=''; CHANGE MASTER TO MASTER_USER='root', MASTER_PASSWORD='', MASTER_SSL=0; + +# MDEV-20122: Deprecate MASTER_USE_GTID=Current_Pos to favor new MASTER_DEMOTE_TO_SLAVE option +--echo "Usage of CURRENT_POS in CHANGE MASTER MASTER_USE_GTID is dreprecated. +CHANGE MASTER TO MASTER_USE_GTID=CURRENT_POS; +CHANGE MASTER TO MASTER_USE_GTID=SLAVE_POS; + --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_change_master_demote.test b/mysql-test/suite/rpl/t/rpl_change_master_demote.test new file mode 100644 index 00000000000..15b55014975 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_change_master_demote.test @@ -0,0 +1,470 @@ +# +# Purpose: +# +# This test suite ensures that the MASTER_DEMOTE_TO_SLAVE option of +# CHANGE MASTER TO will merge the binlog GTID position (gtid_binlog_pos) into +# the replication state (gtid_slave_pos). +# +# +# Methodology: +# +# A series of test cases validate that MASTER_DEMOTE_TO_SLAVE correctly +# merges the binlog GTID state into the replication state. Each test case +# sets up the context in which it will demote the master to a slave, and then +# calls into an include file to perform the actual demotion and validation. +# Specifically, the include file will demote the master to be the slave, +# promote the slave to be the master, ensure that gtid_slave_pos matches +# gtid_current_pos, ensure replication works correctly in this new +# configuration, and return the master and slave to their previous roles. +# +# The test cases are as follows: +# 1) When both gtid_binlog_pos and gtid_slave_pos are empty, +# MASTER_DEMOTE_TO_SLAVE=1 results in no change to replication state. +# +# 2) If gtid_slave_pos is empty, gtid_binlog_pos will completely +# overwrite it with MASTER_DEMOTE_TO_SLAVE=1. +# +# 3) Using a single domain id, if neither gtid_slave_pos nor +# gtid_binlog_pos are empty, and gtid_binlog_pos is more recent, then +# gtid_binlog_pos will overwrite gtid_slave_pos when MASTER_DEMOTE_TO_SLAVE=1. +# +# 4) If gtid_slave_pos and gtid_binlog_pos are equivalent, +# MASTER_DEMOTE_TO_SLAVE=1 will not change gtid_slave_pos. +# +# 5) If multiple new domain ids are added into gtid_binlog_pos while +# gtid_slave_pos already has a state, MASTER_DEMOTE_TO_SLAVE=1 will append +# new GTIDs to gtid_slave_pos with the latest seq_no from each domain. +# +# 6) If gtid_slave_pos has multiple GTID positions and gtid_binlog_pos +# contains updates on existing domain ids, new domains, and differing +# server_ids, MASTER_DEMOTE_TO_SLAVE=1 will update gtid_slave_pos such that +# it will have the seq_nos only from the GTIDs last applied by this server. +# In other words, any GTIDs with server ids that don't match that of the +# demoting server will be ignored in the update. +# +# 7) If MASTER_DEMOTE_TO_SLAVE=1 is combined with IGNORE_DOMAIN_IDS such +# that gtid_binlog_pos has more recent GTIDs than gtid_slave_pos in ignored +# domains, the CHANGE MASTER TO command will still update gtid_slave_pos with +# the most recent transactions from gtid_binlog_pos, despite being ignored by +# CHANGE MASTER TO because they were already applied on the server. +# +# 8) If gtid_binlog_pos is more recent than gtid_slave_pos, and +# MASTER_DEMOTE_TO_SLAVE=1 is combined with a later call to +# START SLAVE UNTIL master_gtid_pos=<G> such that +# gtid_slave_pos < G < gtid_binlog_pos, then the slave should stop +# immediately after SSU because gtid_slave_pos should already be after the +# UNTIL GTID. +# +# 9) If gtid_slave_pos is more recent than gtid_binlog_pos when demoting +# the master to become a slave, the replication state should be preserved. +# +# 10) MASTER_DEMOTE_TO_SLAVE=0 should not change replication state, +# regardless of gtid_slave_pos in comparison to gtid_binlog_pos. +# +# +# Error cases: +# Error Case 1) MASTER_DEMOTE_TO_SLAVE=1 combined with +# MASTER_USE_GTID=NO should result in an error. +# +# Error Case 2) Error when MASTER_DEMOTE_TO_SLAVE=1 is used without +# binary logging enabled. +# +# Error Case 3) Error when MASTER_DEMOTE_TO_SLAVE is provided a +# non-boolean value. +# +# +# References: +# MDEV-19801: Change defaults for CHANGE MASTER TO so that GTID-based +# replication is used by default if master supports it +# +--source include/master-slave.inc +--source include/have_log_bin.inc +--source include/have_binlog_format_mixed.inc + +--connection slave +--source include/stop_slave.inc +change master to master_use_gtid=slave_pos; +--source include/start_slave.inc +--source include/sync_with_master_gtid.inc + +--echo # +--echo # Test Case 1: When both gtid_binlog_pos and gtid_slave_pos are +--echo # empty, MASTER_DEMOTE_TO_SLAVE=1 results in no change to replication +--echo # state. +--echo # +--source include/rpl_change_master_demote.inc + + +--echo # +--echo # Test Case 2: If gtid_slave_pos is empty, gtid_binlog_pos will +--echo # completely overwrite it with MASTER_DEMOTE_TO_SLAVE=1. +--echo # +--connection slave +--source include/stop_slave.inc +RESET MASTER; +set @@global.gtid_slave_pos=""; +--source include/start_slave.inc +--connection master +RESET MASTER; +set @@global.gtid_slave_pos=""; +set session gtid_domain_id= 0; +CREATE TABLE t1 (a int); +INSERT INTO t1 VALUES (1); +--source include/save_master_gtid.inc +--connection slave +--source include/sync_with_master_gtid.inc +--source include/rpl_change_master_demote.inc + + +--echo # +--echo # Test Case 3: Using a single domain id, if neither gtid_slave_pos nor +--echo # gtid_binlog_pos are empty, and gtid_binlog_pos is more recent, then +--echo # gtid_binlog_pos will overwrite gtid_slave_pos when +--echo # MASTER_DEMOTE_TO_SLAVE=1. +--echo # +--connection master +INSERT INTO t1 VALUES (2); +--source include/save_master_gtid.inc +--connection slave +--source include/sync_with_master_gtid.inc +--source include/rpl_change_master_demote.inc + + +--echo # +--echo # Test Case 4: If gtid_slave_pos and gtid_binlog_pos are equivalent, +--echo # MASTER_DEMOTE_TO_SLAVE=1 will not change gtid_slave_pos. +--echo # +--connection master + +--echo # update gtid_binlog_pos and demote it (we have proven this works) +INSERT INTO t1 VALUES (3); +--echo # Update to account for statements to verify replication in include file +--replace_result $SLAVE_MYPORT SLAVE_PORT +--eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$SLAVE_MYPORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1 +RESET SLAVE ALL; + +--source include/save_master_gtid.inc +--connection slave +--source include/sync_with_master_gtid.inc +--source include/rpl_change_master_demote.inc + + +--echo # +--echo # Test Case 5: If a new domain id is added into gtid_binlog_pos while +--echo # gtid_slave_pos already has a state, MASTER_DEMOTE_TO_SLAVE=1 will +--echo # append a new GTID to gtid_slave_pos with the latest seq_no from that +--echo # domain. +--echo # +--connection master + +--echo # Domain_id +set session gtid_domain_id= 0; +INSERT INTO t1 VALUES (4); + +set session gtid_domain_id= 1; +CREATE TABLE t2 (a int); +INSERT INTO t2 VALUES (1); + +--source include/save_master_gtid.inc +--connection slave +--source include/sync_with_master_gtid.inc +--source include/rpl_change_master_demote.inc + + +--echo # +--echo # Test Case 6: If gtid_slave_pos has multiple GTID positions and +--echo # gtid_binlog_pos contains updates on existing domain ids, new +--echo # domains, and differing server_ids, MASTER_DEMOTE_TO_SLAVE=1 will +--echo # update gtid_slave_pos such that it will have the seq_nos only from +--echo # the GTIDs last applied by this server. In other words, any GTIDs +--echo # with server ids that don't match that of the demoting server will be +--echo # ignored in the update. +--echo # + +--connection master +--echo # Update to account for statements to verify replication in include file +set session gtid_domain_id= 0; +INSERT INTO t1 VALUES (5); +--replace_result $SLAVE_MYPORT SLAVE_PORT +--eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$SLAVE_MYPORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1 +RESET SLAVE ALL; + +set session gtid_domain_id= 1; +INSERT INTO t2 VALUES (2); + +set session gtid_domain_id= 2; +CREATE TABLE t3 (a int); +INSERT INTO t3 VALUES (1); + +--echo # The following events have a different server_id and should not go into +--echo # gtid_slave_pos +set @old_server_id = @@server_id; +set session gtid_domain_id= 1; +set session server_id= 3; +INSERT INTO t2 VALUES (3); + +set session gtid_domain_id= 4; +set session server_id= 3; +CREATE TABLE t5 (a int); +INSERT INTO t5 VALUES (1); +set session server_id= @old_server_id; + +--source include/save_master_gtid.inc +--connection slave +--source include/sync_with_master_gtid.inc +--source include/rpl_change_master_demote.inc + + +--echo # +--echo # Test Case 7: If MASTER_DEMOTE_TO_SLAVE=1 is combined with +--echo # IGNORE_DOMAIN_IDS such that gtid_binlog_pos has more recent GTIDs +--echo # than gtid_slave_pos in ignored domains, the CHANGE MASTER TO command +--echo # will still update gtid_slave_pos with the most recent transactions +--echo # from gtid_binlog_pos, despite being ignored by CHANGE MASTER TO +--echo # because they were already applied on the server. +--echo # +--connection master + +set session gtid_domain_id= 2; +INSERT INTO t3 VALUES (2); + +set session gtid_domain_id= 3; +CREATE TABLE t4 (a int); +INSERT INTO t4 VALUES (1); + +--source include/save_master_gtid.inc +--connection slave +--source include/sync_with_master_gtid.inc +--let $ignore_domain_ids=2,3 +--source include/rpl_change_master_demote.inc + + +--echo # +--echo # Test Case 8: If gtid_binlog_pos is more recent than gtid_slave_pos, +--echo # and MASTER_DEMOTE_TO_SLAVE=1 is combined with a later call to +--echo # START SLAVE UNTIL master_gtid_pos=<G> such that +--echo # gtid_slave_pos < G < gtid_binlog_pos, then the slave should stop +--echo # immediately after SSU because gtid_slave_pos should be updated to be +--echo # after G. +--echo # + +--connection master +set session gtid_domain_id= 0; +INSERT INTO t1 VALUES (6); +--let $ssu_middle_binlog_pos= `SELECT @@GLOBAL.gtid_binlog_pos` +--echo # Tagging ssu_middle_binlog_pos here to be used for START SLAVE UNTIL +INSERT INTO t1 VALUES (7); +--source include/save_master_gtid.inc + +--echo # Ensure slave is up-to-date with master and then disable slave status +--connection slave +--source include/sync_with_master_gtid.inc +--source include/stop_slave.inc + +--connection master +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' ORDER BY VARIABLE_NAME ASC; +--replace_result $SLAVE_MYPORT SLAVE_PORT +--eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$SLAVE_MYPORT, master_user='root', master_use_gtid=Slave_Pos, master_demote_to_slave=1 +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' ORDER BY VARIABLE_NAME ASC; + +--echo # GTID ssu_middle_binlog_pos should be considered in the past because +--echo # gtid_slave_pos should be updated using the latest binlog gtids. +--echo # The following call to sync_with_master_gtid.inc uses the latest +--echo # binlog position and should still succeed despite the SSU stop +--echo # position pointing to a previous event (because +--echo # master_demote_to_slave=1 merges gtid_binlog_pos into gtid_slave_pos). +--replace_result $ssu_middle_binlog_pos ssu_middle_binlog_pos +eval START SLAVE UNTIL master_gtid_pos="$ssu_middle_binlog_pos"; + +--echo # Slave needs time to start and stop automatically +# Note sync_with_master_gtid.inc, wait_for_slave_to_start.inc, and +# wait_for_slave_to_stop.inc won't work due to replication state and race +# conditions +--sleep 1 + +--echo # Validating neither SQL nor IO threads are running.. +--let $io_state= query_get_value("SHOW SLAVE STATUS", Slave_IO_State, 1) +if (`SELECT strcmp("$io_state","") != 0`) +{ + die "IO thread should not be running after START SLAVE UNTIL master_gtid_pos using a pre-existing GTID"; +} +--let $sql_state= query_get_value("SHOW SLAVE STATUS", Slave_SQL_Running_State, 1) +if (`SELECT strcmp("$sql_state","") != 0`) +{ + die "SQL thread should not be running after START SLAVE UNTIL master_gtid_pos using a pre-existing GTID"; +} +--echo # ..success + +--echo # Clean slave state of master +RESET SLAVE ALL; + + +--echo # +--echo # Test Case 9: If gtid_slave_pos is more recent than gtid_binlog_pos +--echo # when demoting the master to become a slave, the replication state +--echo # should be preserved. +--echo # + +--echo # rpl_change_master_demote.inc should force +--echo # gtid_slave_pos > gtid_binlog_pos in domain 0 (due to the step which +--echo # validates replication works) +--connection master +--source include/rpl_change_master_demote.inc + +--let $current_pos= `SELECT @@gtid_current_pos` + +--echo # Demote master to slave with the more recent gtid_slave_pos +--connection master +--let $old_slave_pos= `SELECT @@gtid_slave_pos` +--replace_result $SLAVE_MYPORT SLAVE_PORT +--eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$SLAVE_MYPORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1 +--let $new_slave_pos= `SELECT @@gtid_slave_pos` + +--echo # Validating gtid_slave_pos is unchanged.. +if ($old_slave_pos != $new_slave_pos) +{ + SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; + die "gtid_slave_pos should not change when MASTER_DEMOTE_TO_SLAVE=0"; +} +--echo # ..success + +--echo # Validating gtid_slave_pos == gtid_binlog_pos.. +if ($new_slave_pos != $current_pos) +{ + SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' OR VARIABLE_NAME LIKE 'gtid_current_pos' ORDER BY VARIABLE_NAME ASC; + die gtid_slave_pos calculation after master_demote_to_slave=1 differs from gtid_current_pos; +} +--echo # ..success + +--echo # Clean slave state of master +RESET SLAVE ALL; + + +--echo # +--echo # Test Case 10: MASTER_DEMOTE_TO_SLAVE=0 should not change replication +--echo # state, regardless of gtid_slave_pos in comparison to gtid_binlog_pos. +--echo # + +--echo # In domain 0, make gtid_slave_pos > gtid_binlog_pos +--connection master +--source include/rpl_change_master_demote.inc + +--echo # Tag gtid_slave_pos now (before binlog updates) for later comparison +--let $old_slave_pos= `SELECT @@gtid_slave_pos` + +--connection master +--echo # In domain 1, make gtid_slave_pos < gtid_binlog_pos +set session gtid_domain_id= 1; +INSERT INTO t2 VALUES (4); + +--echo # In domains 2, 3 and 4, gtid_slave_pos == gtid_binlog_pos + +--echo # Include a new domain id (5) +set session gtid_domain_id= 5; +CREATE TABLE t6 (a int); +INSERT INTO t6 VALUES (1); + +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' ORDER BY VARIABLE_NAME ASC; +--replace_result $SLAVE_MYPORT SLAVE_PORT +--eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$SLAVE_MYPORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=0 + +--echo # Validating gtid_slave_pos is unchanged.. +--let $new_slave_pos= `SELECT @@gtid_slave_pos` +if ($old_slave_pos != $new_slave_pos) +{ + SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' ORDER BY VARIABLE_NAME ASC; + die gtid_slave_pos should not change when MASTER_DEMOTE_TO_SLAVE=0; +} +--echo # ..success + +--echo # Clean slave state of master +--replace_result $SLAVE_MYPORT SLAVE_PORT +--eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$SLAVE_MYPORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1 +RESET SLAVE ALL; +SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME LIKE 'gtid_binlog_pos' OR VARIABLE_NAME LIKE 'gtid_slave_pos' ORDER BY VARIABLE_NAME ASC; + + +--echo # +--echo # +--echo # Stop slave for error test cases +--connection slave +--source include/stop_slave.inc + +--echo # +--echo # Error Case 1: MASTER_DEMOTE_TO_SLAVE=1 combined with +--echo # MASTER_USE_GTID=NO should result in an error. +--echo # +--connection master +--replace_result $SLAVE_MYPORT SLAVE_PORT +--error 4191 +--eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$SLAVE_MYPORT, master_user='root', master_use_gtid=no, master_demote_to_slave=1 + + +--echo # +--echo # Error Case 2: Error when MASTER_DEMOTE_TO_SLAVE=1 is used without +--echo # binary logging enabled. +--echo # +--connection master + +--echo # Restarting master without binary log +--write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect +wait +EOF +--shutdown_server +--source include/wait_until_disconnected.inc +--append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect +restart: --skip-slave-start=1 --skip-log-bin +EOF +--enable_reconnect +--source include/wait_until_connected_again.inc + +--replace_result $SLAVE_MYPORT SLAVE_PORT +--error 1381 +--eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$SLAVE_MYPORT, master_user='root', master_use_gtid=Slave_Pos, master_demote_to_slave=1 + +--echo # Restarting master to re-enable binary log +--write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect +wait +EOF +--shutdown_server +--source include/wait_until_disconnected.inc +--append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect +restart: --skip-slave-start=1 +EOF +--enable_reconnect +--source include/wait_until_connected_again.inc + +--connection server_1 +--enable_reconnect +--source include/wait_until_connected_again.inc + +--connection default +--enable_reconnect +--source include/wait_until_connected_again.inc + + +--echo # +--echo # Error Case 3: Error when MASTER_DEMOTE_TO_SLAVE is provided a +--echo # non-boolean value. +--echo # + +--connection master +--replace_result $SLAVE_MYPORT SLAVE_PORT +--error 1064 +--eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$SLAVE_MYPORT, master_user='root', master_use_gtid=Slave_Pos, master_demote_to_slave=invalid + + +--echo # +--echo # Cleanup +--echo # +--connection master +DROP TABLE t1, t2, t3, t4, t5, t6; +--source include/save_master_gtid.inc + +--connection slave +--source include/start_slave.inc +--source include/sync_with_master_gtid.inc + +--source include/rpl_end.inc +--echo # +--echo ### End rpl_change_master_demote.test diff --git a/mysql-test/suite/rpl/t/rpl_colSize.test b/mysql-test/suite/rpl/t/rpl_colSize.test index d6f817af189..23c8bdc3e2d 100644 --- a/mysql-test/suite/rpl/t/rpl_colSize.test +++ b/mysql-test/suite/rpl/t/rpl_colSize.test @@ -17,7 +17,7 @@ DROP TABLE IF EXISTS t1; sync_slave_with_master; STOP SLAVE; --source include/wait_for_slave_to_stop.inc -RESET SLAVE; +--source include/reset_slave.inc SET @saved_slave_type_conversions = @@slave_type_conversions; SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_NON_LOSSY'; diff --git a/mysql-test/suite/rpl/t/rpl_delayed_slave.test b/mysql-test/suite/rpl/t/rpl_delayed_slave.test index 7dd7b9cf6d9..d00e796b66f 100644 --- a/mysql-test/suite/rpl/t/rpl_delayed_slave.test +++ b/mysql-test/suite/rpl/t/rpl_delayed_slave.test @@ -63,6 +63,9 @@ call mtr.add_suppression("Unsafe statement written to the binary log using statement format"); --connection slave call mtr.add_suppression("Unsafe statement written to the binary log using statement format"); +--source include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +--source include/start_slave.inc --connection master @@ -371,7 +374,8 @@ CHANGE MASTER TO MASTER_DELAY = 71; --source include/rpl_assert.inc --source include/stop_slave.inc -RESET SLAVE; +--let $master_use_gtid_option= No +--source include/reset_slave.inc --echo [on master] --connection master RESET MASTER; diff --git a/mysql-test/suite/rpl/t/rpl_gtid_crash.test b/mysql-test/suite/rpl/t/rpl_gtid_crash.test index d0af69a65ed..1249a0f619e 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_crash.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_crash.test @@ -27,7 +27,7 @@ SET sql_log_bin=1; --source include/stop_slave.inc --replace_result $MASTER_MYPORT MASTER_PORT eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $MASTER_MYPORT, - MASTER_USE_GTID=CURRENT_POS; + MASTER_USE_GTID=SLAVE_POS; --connection server_1 INSERT INTO t1 VALUES (2,1); diff --git a/mysql-test/suite/rpl/t/rpl_gtid_excess_initial_delay.test b/mysql-test/suite/rpl/t/rpl_gtid_excess_initial_delay.test index d840b67e9e8..6b1eec1984b 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_excess_initial_delay.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_excess_initial_delay.test @@ -7,7 +7,7 @@ # # Steps: # 0 - Stop the slave and execute CHANGE MASTER command with -# master_use_gtid= curren_pos and master_delay= 10 +# master_delay= 10 # 1 - On slave introduce a sleep of 15 seconds and check that the # Seconds_Behind_Master is within specified master_delay limit. It should # not be more that "10" seconds. @@ -23,7 +23,7 @@ CREATE TABLE t1 (i INT); --sync_slave_with_master --source include/stop_slave.inc -CHANGE MASTER TO MASTER_USE_GTID= current_pos, MASTER_DELAY= 10; +CHANGE MASTER TO MASTER_DELAY= 10; --source include/start_slave.inc --connection master @@ -47,7 +47,7 @@ INSERT INTO t1 VALUES (1); --echo "======= Clean up ========" STOP SLAVE; -CHANGE MASTER TO MASTER_USE_GTID=no, MASTER_DELAY=0; +CHANGE MASTER TO MASTER_DELAY=0; START SLAVE; --connection master diff --git a/mysql-test/suite/rpl/t/rpl_gtid_master_promote.test b/mysql-test/suite/rpl/t/rpl_gtid_master_promote.test index bd5343d7558..064c70b123d 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_master_promote.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_master_promote.test @@ -31,22 +31,18 @@ delimiter ;| --connection server_2 --sync_with_master --source include/stop_slave.inc -CHANGE MASTER TO master_use_gtid=current_pos; --connection server_3 --sync_with_master --source include/stop_slave.inc -CHANGE MASTER TO master_use_gtid=current_pos; --connection server_4 --sync_with_master --source include/stop_slave.inc -CHANGE MASTER TO master_use_gtid=current_pos; --connection server_5 --sync_with_master --source include/stop_slave.inc -CHANGE MASTER TO master_use_gtid=current_pos; # Create three separate replication streams on master server_1. @@ -225,7 +221,7 @@ SELECT * FROM t4 ORDER BY a,b; --connection server_1 --replace_result $SERVER_MYPORT_2 SERVER_MYPORT_2 eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $SERVER_MYPORT_2, - master_user = "root", master_use_gtid = current_pos; + master_user = "root", master_use_gtid = slave_pos, master_demote_to_slave=1; --source include/start_slave.inc --sync_with_master SELECT * FROM t1 ORDER BY a; diff --git a/mysql-test/suite/rpl/t/rpl_gtid_mdev4473.test b/mysql-test/suite/rpl/t/rpl_gtid_mdev4473.test index 01259eb5765..f52e51c2413 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_mdev4473.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_mdev4473.test @@ -24,7 +24,7 @@ reset slave all; connection server_1; --replace_result $SERVER_MYPORT_2 SERVER_MYPORT_2 eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $SERVER_MYPORT_2, - master_user='root', MASTER_USE_GTID=CURRENT_POS; + master_user='root', MASTER_USE_GTID=SLAVE_POS, master_demote_to_slave=1; source include/start_slave.inc; source include/wait_for_slave_to_start.inc; @@ -38,7 +38,7 @@ save_master_pos; connection server_3; --replace_result $SERVER_MYPORT_2 SERVER_MYPORT_2 eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $SERVER_MYPORT_2, - MASTER_USE_GTID=CURRENT_POS; + MASTER_USE_GTID=SLAVE_POS; source include/start_slave.inc; sync_with_master; @@ -56,14 +56,14 @@ reset slave all; connection server_2; --replace_result $SERVER_MYPORT_1 SERVER_MYPORT_1 eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $SERVER_MYPORT_1, - master_user = 'root', MASTER_USE_GTID=CURRENT_POS; + master_user = 'root', MASTER_USE_GTID=SLAVE_POS, master_demote_to_slave=1; source include/start_slave.inc; connection server_3; source include/stop_slave.inc; --replace_result $SERVER_MYPORT_1 SERVER_MYPORT_1 eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $SERVER_MYPORT_1, - MASTER_USE_GTID=CURRENT_POS; + MASTER_USE_GTID=SLAVE_POS; source include/start_slave.inc; connection server_1; diff --git a/mysql-test/suite/rpl/t/rpl_gtid_mdev9033.test b/mysql-test/suite/rpl/t/rpl_gtid_mdev9033.test index f8e8642af28..76723e1d265 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_mdev9033.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_mdev9033.test @@ -63,10 +63,10 @@ DROP TABLE t2; --connection server_2 STOP SLAVE; -CHANGE MASTER TO MASTER_USE_GTID = NO, IGNORE_DOMAIN_IDS = (); +CHANGE MASTER TO IGNORE_DOMAIN_IDS = (); --connection server_3 STOP SLAVE; -CHANGE MASTER TO MASTER_USE_GTID = NO, IGNORE_DOMAIN_IDS = (); +CHANGE MASTER TO IGNORE_DOMAIN_IDS = (); --echo # End of test. diff --git a/mysql-test/suite/rpl/t/rpl_gtid_misc.test b/mysql-test/suite/rpl/t/rpl_gtid_misc.test index 66d98ec8025..a78b74714a5 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_misc.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_misc.test @@ -13,7 +13,6 @@ CREATE TABLE t1 (a INT PRIMARY KEY); SET sql_log_bin= 0; INSERT INTO t1 VALUES (1); SET sql_log_bin= 1; -CHANGE MASTER TO master_use_gtid= current_pos; --connection master diff --git a/mysql-test/suite/rpl/t/rpl_gtid_nobinlog.test b/mysql-test/suite/rpl/t/rpl_gtid_nobinlog.test index a5caebf0276..e140f335963 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_nobinlog.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_nobinlog.test @@ -25,7 +25,7 @@ SELECT * FROM t1 ORDER BY a; --connection server_1 --replace_result $SLAVE_MYPORT SLAVE_PORT eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $SLAVE_MYPORT, - master_user = 'root', master_use_gtid = current_pos; + master_user = 'root'; START SLAVE; --source include/wait_for_slave_to_start.inc @@ -49,8 +49,7 @@ INSERT INTO t1 VALUES (6, 1); --connection server_2 --replace_result $MASTER_MYPORT MASTER_PORT -eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $MASTER_MYPORT, - master_use_gtid = current_pos; +eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $MASTER_MYPORT; START SLAVE; --source include/sync_with_master_gtid.inc diff --git a/mysql-test/suite/rpl/t/rpl_gtid_reconnect.test b/mysql-test/suite/rpl/t/rpl_gtid_reconnect.test index bc28ebddf5e..1452d6b01f0 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_reconnect.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_reconnect.test @@ -4,11 +4,6 @@ --source include/have_debug.inc ---connection server_2 ---source include/stop_slave.inc -CHANGE MASTER TO master_use_gtid= current_pos; ---source include/start_slave.inc - --connection server_1 CREATE TABLE t1 (a INT); FLUSH LOGS; diff --git a/mysql-test/suite/rpl/t/rpl_gtid_sort.test b/mysql-test/suite/rpl/t/rpl_gtid_sort.test index dc3b18aa897..c31ba877bbf 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_sort.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_sort.test @@ -47,7 +47,7 @@ SHOW VARIABLES LIKE 'gtid_slave_pos'; SHOW VARIABLES LIKE 'gtid_binlog_state'; --replace_result $MASTER_MYPORT MASTER_PORT eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $MASTER_MYPORT, - MASTER_USE_GTID=CURRENT_POS; + MASTER_USE_GTID=SLAVE_POS; --source include/start_slave.inc --sync_with_master SHOW VARIABLES LIKE 'gtid_binlog_pos'; diff --git a/mysql-test/suite/rpl/t/rpl_gtid_startpos.test b/mysql-test/suite/rpl/t/rpl_gtid_startpos.test index 100d75a8cdc..c7bcc1bb97e 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_startpos.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_startpos.test @@ -19,7 +19,7 @@ CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; SET GLOBAL gtid_slave_pos=""; --replace_result $MASTER_MYPORT MASTER_PORT eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $MASTER_MYPORT, - MASTER_USE_GTID=CURRENT_POS; + MASTER_USE_GTID=SLAVE_POS; --source include/start_slave.inc --sync_with_master SELECT * FROM t1; @@ -46,7 +46,7 @@ INSERT INTO t1 VALUES (2); SET GLOBAL gtid_slave_pos=""; --replace_result $MASTER_MYPORT MASTER_PORT eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $MASTER_MYPORT, - MASTER_USE_GTID=CURRENT_POS; + MASTER_USE_GTID=SLAVE_POS; START SLAVE; --let $slave_io_errno= 1236 --source include/wait_for_slave_io_error.inc @@ -54,7 +54,7 @@ START SLAVE; --replace_result $MASTER_MYPORT MASTER_PORT eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $MASTER_MYPORT, - MASTER_LOG_FILE="master-bin.000003", MASTER_LOG_POS=4; + MASTER_LOG_FILE="master-bin.000003", MASTER_LOG_POS=4, MASTER_USE_GTID=NO; --source include/start_slave.inc --sync_with_master SELECT * FROM t1 ORDER BY a; @@ -73,7 +73,7 @@ INSERT INTO t1 VALUES(3); SET GLOBAL gtid_slave_pos='0-1-3'; --replace_result $MASTER_MYPORT MASTER_PORT eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $MASTER_MYPORT, - MASTER_USE_GTID=CURRENT_POS; + MASTER_USE_GTID=SLAVE_POS; --source include/start_slave.inc --source include/sync_with_master_gtid.inc SELECT * FROM t1 ORDER by a; @@ -118,7 +118,7 @@ RESET MASTER; --connection server_2 SET GLOBAL gtid_slave_pos=''; --replace_result $MASTER_MYPORT MASTER_PORT -eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$MASTER_MYPORT, master_user='root', master_use_gtid=current_pos; +eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$MASTER_MYPORT, master_user='root', master_use_gtid=slave_pos; --source include/start_slave.inc --connection server_1 @@ -185,7 +185,8 @@ SELECT * FROM t1 ORDER BY a; --echo *** Test that RESET SLAVE clears the Using_Gtid flag. *** --source include/stop_slave.inc -RESET SLAVE; +--let $master_use_gtid_option= No +--source include/reset_slave.inc --let $status_items= Using_Gtid --source include/show_slave_status.inc @@ -198,7 +199,7 @@ START SLAVE; # Going back to using GTID should fix things. STOP SLAVE IO_THREAD; -CHANGE MASTER TO MASTER_USE_GTID=CURRENT_POS; +CHANGE MASTER TO MASTER_USE_GTID=SLAVE_POS; --source include/start_slave.inc --connection server_1 @@ -286,6 +287,7 @@ eval SELECT '$value' AS Gtid_Slave_Pos; --source include/stop_slave.inc DROP TABLE t1; RESET SLAVE ALL; +CHANGE MASTER TO MASTER_USE_GTID=NO; RESET MASTER; SET GLOBAL gtid_slave_pos= ""; diff --git a/mysql-test/suite/rpl/t/rpl_gtid_stop_start.test b/mysql-test/suite/rpl/t/rpl_gtid_stop_start.test index 2cf184a3401..7fb457f6d7f 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_stop_start.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_stop_start.test @@ -21,7 +21,6 @@ INSERT INTO t1 VALUES (1); --let $status_items= Master_Log_File,Using_Gtid --source include/show_slave_status.inc -CHANGE MASTER TO master_use_gtid=current_pos; # Now try to restart the slave mysqld server without starting the slave first # threads after the CHANGE MASTER. diff --git a/mysql-test/suite/rpl/t/rpl_gtid_until.test b/mysql-test/suite/rpl/t/rpl_gtid_until.test index aa05ecf79ab..c89cea23e93 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_until.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_until.test @@ -2,6 +2,11 @@ --let $rpl_topology=1->2 --source include/rpl_init.inc +--connection server_2 +--source include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +--source include/start_slave.inc + --connection server_1 ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; # Function to extract one GTID from a list. @@ -40,7 +45,7 @@ START SLAVE UNTIL master_gtid_pos = ""; --error ER_UNTIL_REQUIRES_USING_GTID START SLAVE UNTIL master_gtid_pos = ""; -CHANGE MASTER TO master_use_gtid=current_pos; +CHANGE MASTER TO master_use_gtid=slave_pos; --connection server_1 CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; @@ -219,7 +224,7 @@ INSERT INTO t1 VALUES (10); --connection server_2 --replace_result $SERVER_MYPORT_1 SERVER_MYPORT_1 eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $SERVER_MYPORT_1, - master_user = "root", master_use_gtid = current_pos; + master_user = "root", master_use_gtid = slave_pos; eval START SLAVE UNTIL master_gtid_pos = '$until_condition'; --source include/wait_for_slave_to_start.inc diff --git a/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test b/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test index 45b5d48c13b..d6d14e0278d 100644 --- a/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test +++ b/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test @@ -52,7 +52,7 @@ let $slave_net_timeout= query_get_value(SHOW VARIABLES LIKE 'slave_net_timeout', let $slave_heartbeat_timeout= query_get_value(SHOW GLOBAL STATUS LIKE 'slave_heartbeat_period', Value, 1); let $result= query_get_value(SELECT $slave_net_timeout/$slave_heartbeat_timeout AS Result, Result, 1); --echo slave_net_timeout/slave_heartbeat_timeout=$result -RESET SLAVE; +--source include/reset_slave.inc --echo # Reset slave set slave_heartbeat_timeout = slave_net_timeout/2 @@ -62,7 +62,7 @@ SET @@global.slave_net_timeout=30; --enable_warnings --replace_result $MASTER_MYPORT MASTER_PORT eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT, MASTER_USER='root', MASTER_CONNECT_RETRY=$connect_retry, MASTER_HEARTBEAT_PERIOD=5; -RESET SLAVE; +--source include/reset_slave.inc SHOW GLOBAL STATUS LIKE 'slave_heartbeat_period'; --echo @@ -75,7 +75,7 @@ SET @@global.slave_net_timeout=50; eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT, MASTER_USER='root', MASTER_CONNECT_RETRY=$connect_retry; SHOW GLOBAL STATUS LIKE 'slave_heartbeat_period'; SET @@global.slave_net_timeout=@restore_slave_net_timeout; -RESET SLAVE; +--source include/reset_slave.inc --echo # Set slave_net_timeout less than current value of slave_heartbeat_period @@ -320,8 +320,10 @@ INSERT INTO t1 VALUES (1, 'on slave', NULL); --connection master INSERT INTO t1 VALUES (1, 'on master', NULL); --connection slave +set sql_log_bin= 0; call mtr.add_suppression("Slave SQL.*Duplicate entry .1. for key .PRIMARY.. on query.* error.* 1062"); call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group"); +set sql_log_bin= 1; let $slave_errno= ER_DUP_ENTRY --source include/wait_for_slave_sql_error.inc let $rcvd_heartbeats_before= query_get_value(SHOW STATUS LIKE 'slave_received_heartbeats', Value, 1); @@ -330,7 +332,9 @@ let $rcvd_heartbeats_after= query_get_value(SHOW STATUS LIKE 'slave_received_hea let $result= query_get_value(SELECT ($rcvd_heartbeats_after - $rcvd_heartbeats_before) > 0 AS Result, Result, 1); --echo Heartbeat events are received while sql thread stopped (1 means 'yes'): $result --source include/stop_slave.inc +set sql_log_bin= 0; DROP TABLE t1; +set sql_log_bin= 1; --echo # Check received heartbeat events while master send events to slave @@ -346,7 +350,7 @@ CREATE EVENT e1 END| DELIMITER ;| --connection slave -RESET SLAVE; +--source include/reset_slave.inc --replace_result $MASTER_MYPORT MASTER_PORT eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT, MASTER_USER='root', MASTER_CONNECT_RETRY=$connect_retry, MASTER_HEARTBEAT_PERIOD=5; --source include/start_slave.inc @@ -404,8 +408,10 @@ DROP EVENT e1; # Check received heartbeat events while logs flushed on slave --echo *** Flush logs on slave *** STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc +set sql_log_bin= 0; DROP TABLE t1; +set sql_log_bin= 1; --connection master DROP TABLE t1; RESET MASTER; @@ -435,7 +441,7 @@ let $result= query_get_value(SELECT ($rcvd_heartbeats_after - $rcvd_heartbeats_b SET @@global.slave_compressed_protocol=1; --connection slave --source include/stop_slave.inc -RESET SLAVE; +--source include/reset_slave.inc SET @@global.slave_compressed_protocol=1; --replace_result $MASTER_MYPORT MASTER_PORT eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT, MASTER_USER='root', MASTER_CONNECT_RETRY=$connect_retry, MASTER_HEARTBEAT_PERIOD=0.1; @@ -455,7 +461,7 @@ SET @@global.slave_compressed_protocol=0; --echo *** Reset master *** --connection slave STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc --replace_result $MASTER_MYPORT MASTER_PORT eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT, MASTER_USER='root', MASTER_CONNECT_RETRY=$connect_retry, MASTER_HEARTBEAT_PERIOD=0.1; --source include/start_slave.inc @@ -474,7 +480,7 @@ let $result= query_get_value(SELECT ($rcvd_heartbeats_after - $rcvd_heartbeats_b --echo *** Reload master *** --connection slave STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc --replace_result $MASTER_MYPORT MASTER_PORT eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT, MASTER_USER='root', MASTER_CONNECT_RETRY=$connect_retry, MASTER_HEARTBEAT_PERIOD=0.1; --source include/start_slave.inc diff --git a/mysql-test/suite/rpl/t/rpl_heartbeat_ssl.test b/mysql-test/suite/rpl/t/rpl_heartbeat_ssl.test index 810db4cc6f7..2c41fdeeca8 100644 --- a/mysql-test/suite/rpl/t/rpl_heartbeat_ssl.test +++ b/mysql-test/suite/rpl/t/rpl_heartbeat_ssl.test @@ -29,7 +29,8 @@ eval CHANGE MASTER TO MASTER_SSL=1, MASTER_SSL_CA='$MYSQL_TEST_DIR/std_data/cacert.pem', MASTER_SSL_CERT='$MYSQL_TEST_DIR/std_data/client-cert.pem', - MASTER_SSL_KEY='$MYSQL_TEST_DIR/std_data/client-key.pem'; + MASTER_SSL_KEY='$MYSQL_TEST_DIR/std_data/client-key.pem', + MASTER_USE_GTID=NO; --source include/start_slave.inc # Check SSL state of slave let $slave_ssl_status= query_get_value(SHOW SLAVE STATUS, Master_SSL_Allowed, 1); diff --git a/mysql-test/suite/rpl/t/rpl_innodb_bug68220.test b/mysql-test/suite/rpl/t/rpl_innodb_bug68220.test deleted file mode 100644 index 1e4f40a0019..00000000000 --- a/mysql-test/suite/rpl/t/rpl_innodb_bug68220.test +++ /dev/null @@ -1,53 +0,0 @@ ---source include/have_innodb.inc ---source include/have_binlog_format_row.inc ---source include/master-slave.inc - -# -# Bug#68220: innodb_rows_updated is misleading on slave when *info_repository=TABLE -# - -# created all the base variables at the beginning at the test ---connection master -select variable_value into @master_rows_read from information_schema.global_status where variable_name = 'innodb_rows_read'; -select variable_value into @master_rows_updated from information_schema.global_status where variable_name = 'innodb_rows_updated'; -select variable_value into @master_rows_deleted from information_schema.global_status where variable_name = 'innodb_rows_deleted'; -select variable_value into @master_rows_inserted from information_schema.global_status where variable_name = 'innodb_rows_inserted'; -select variable_value into @master_system_rows_read from information_schema.global_status where variable_name = 'innodb_system_rows_read'; -select variable_value into @master_system_rows_updated from information_schema.global_status where variable_name = 'innodb_system_rows_updated'; -select variable_value into @master_system_rows_deleted from information_schema.global_status where variable_name = 'innodb_system_rows_deleted'; -select variable_value into @master_system_rows_inserted from information_schema.global_status where variable_name = 'innodb_system_rows_inserted'; - ---connection slave -select variable_value into @slave_rows_read from information_schema.global_status where variable_name = 'innodb_rows_read'; -select variable_value into @slave_rows_updated from information_schema.global_status where variable_name = 'innodb_rows_updated'; -select variable_value into @slave_rows_deleted from information_schema.global_status where variable_name = 'innodb_rows_deleted'; -select variable_value into @slave_rows_inserted from information_schema.global_status where variable_name = 'innodb_rows_inserted'; -select variable_value into @slave_system_rows_read from information_schema.global_status where variable_name = 'innodb_system_rows_read'; -select variable_value into @slave_system_rows_updated from information_schema.global_status where variable_name = 'innodb_system_rows_updated'; -select variable_value into @slave_system_rows_deleted from information_schema.global_status where variable_name = 'innodb_system_rows_deleted'; -select variable_value into @slave_system_rows_inserted from information_schema.global_status where variable_name = 'innodb_system_rows_inserted'; - ---connection master -CREATE DATABASE testdb; -USE testdb; -CREATE TABLE testdb.t1 (i int NOT NULL PRIMARY KEY) ENGINE=InnoDB; - -# insert a row and show counters on master and slave -INSERT INTO testdb.t1 VALUES (1); ---source suite/rpl/include/rpl_innodb_rows_counters.inc - -# update the row and show counters on master and slave -UPDATE t1 SET i=2 WHERE i=1; ---sync_slave_with_master ---source suite/rpl/include/rpl_innodb_rows_counters.inc - -# delete the row and show counters on master and slave -DELETE FROM t1 WHERE i=2; ---source suite/rpl/include/rpl_innodb_rows_counters.inc - -# clean the test -DROP TABLE t1; -DROP DATABASE testdb; ---sync_slave_with_master - ---source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_log_pos.test b/mysql-test/suite/rpl/t/rpl_log_pos.test index 4f63cd32916..1504cba0774 100644 --- a/mysql-test/suite/rpl/t/rpl_log_pos.test +++ b/mysql-test/suite/rpl/t/rpl_log_pos.test @@ -26,7 +26,7 @@ source include/stop_slave.inc; let $wrong_log_pos= `SELECT $read_pos+2`; --replace_result $wrong_log_pos MASTER_LOG_POS -eval change master to master_log_pos=$wrong_log_pos; +eval change master to master_log_pos=$wrong_log_pos, master_use_gtid=no; start slave; let $slave_io_errno= 1236; --let $show_slave_io_error= 1 @@ -45,7 +45,7 @@ insert into t1 values (1),(2),(3); save_master_pos; connection slave; --replace_result 4 MASTER_LOG_POS -change master to master_log_pos=4; +change master to master_log_pos=4, master_use_gtid=no; start slave; sync_with_master; select * from t1 ORDER BY n; diff --git a/mysql-test/suite/rpl/t/rpl_manual_change_index_file.test b/mysql-test/suite/rpl/t/rpl_manual_change_index_file.test index 1c087c550d0..cd472f6eab6 100644 --- a/mysql-test/suite/rpl/t/rpl_manual_change_index_file.test +++ b/mysql-test/suite/rpl/t/rpl_manual_change_index_file.test @@ -1,5 +1,11 @@ source include/master-slave.inc; +connection slave; +source include/stop_slave.inc; +CHANGE MASTER TO MASTER_USE_GTID=NO; +source include/start_slave.inc; +connection master; + # # BUG#28421 Infinite loop on slave relay logs # diff --git a/mysql-test/suite/rpl/t/rpl_mariadb_slave_capability.test b/mysql-test/suite/rpl/t/rpl_mariadb_slave_capability.test index 19f2db32cb7..d49851cc8ce 100644 --- a/mysql-test/suite/rpl/t/rpl_mariadb_slave_capability.test +++ b/mysql-test/suite/rpl/t/rpl_mariadb_slave_capability.test @@ -12,6 +12,12 @@ set @old_master_binlog_checksum= @@global.binlog_checksum; # # Test this by binlog rotation before we log any GTIDs. connection slave; + +# Need to stop/start the master without GTID before setting debug_dbug +--source include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +--source include/start_slave.inc + --source include/stop_slave.inc --echo # Test slave with no capability gets dummy event, which is ignored. set @old_dbug= @@global.debug_dbug; diff --git a/mysql-test/suite/rpl/t/rpl_mdev6020.test b/mysql-test/suite/rpl/t/rpl_mdev6020.test index ec3fd92f817..06f03be1430 100644 --- a/mysql-test/suite/rpl/t/rpl_mdev6020.test +++ b/mysql-test/suite/rpl/t/rpl_mdev6020.test @@ -29,7 +29,7 @@ SET GLOBAL default_storage_engine=InnoDB; SET @old_parallel= @@GLOBAL.slave_parallel_threads; SET GLOBAL slave_parallel_threads=12; --replace_result $SERVER_MYPORT_1 SERVER_MYPORT_1 -eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$SERVER_MYPORT_1, master_user='root', master_log_file='master-bin.000001', master_log_pos=4; +eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$SERVER_MYPORT_1, master_user='root', master_log_file='master-bin.000001', master_log_pos=4, master_use_gtid=no; --source include/start_slave.inc --connection master diff --git a/mysql-test/suite/rpl/t/rpl_mdev6386.test b/mysql-test/suite/rpl/t/rpl_mdev6386.test index e6fb72dc788..f969d656ffb 100644 --- a/mysql-test/suite/rpl/t/rpl_mdev6386.test +++ b/mysql-test/suite/rpl/t/rpl_mdev6386.test @@ -13,7 +13,6 @@ SET sql_log_bin= 0; CALL mtr.add_suppression("Commit failed due to failure of an earlier commit on which this one depends"); INSERT INTO t1 VALUES (1, 2); SET sql_log_bin= 1; -CHANGE MASTER TO master_use_gtid= current_pos; --echo Contents on slave before: SELECT * FROM t1 ORDER BY a; diff --git a/mysql-test/suite/rpl/t/rpl_mdev_17614.test b/mysql-test/suite/rpl/t/rpl_mdev_17614.test index c11aad3305e..8d91944a8eb 100644 --- a/mysql-test/suite/rpl/t/rpl_mdev_17614.test +++ b/mysql-test/suite/rpl/t/rpl_mdev_17614.test @@ -42,7 +42,7 @@ SELECT * FROM t1; # restart replication for the next testcase stop slave; --source include/wait_for_slave_to_stop.inc -reset slave; +--source include/reset_slave.inc connection master; reset master; drop table t1; @@ -161,7 +161,7 @@ SELECT * FROM t1; # restart replication for the next testcase stop slave; --source include/wait_for_slave_to_stop.inc -reset slave; +--source include/reset_slave.inc connection master; reset master; drop table t1; diff --git a/mysql-test/suite/rpl/t/rpl_mysql57_stm_temporal_round.test b/mysql-test/suite/rpl/t/rpl_mysql57_stm_temporal_round.test index 675b7db0603..34001382c93 100644 --- a/mysql-test/suite/rpl/t/rpl_mysql57_stm_temporal_round.test +++ b/mysql-test/suite/rpl/t/rpl_mysql57_stm_temporal_round.test @@ -43,7 +43,7 @@ CREATE TABLE t1 (id SERIAL, a DATETIME(3)); --connection slave --replace_result $SERVER_MYPORT_1 SERVER_MYPORT_1 -eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$SERVER_MYPORT_1, master_user='root', master_log_file='master-bin.000001', master_log_pos=4; +eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$SERVER_MYPORT_1, master_user='root', master_log_file='master-bin.000001', master_log_pos=4, master_use_gtid=no; --source include/start_slave.inc diff --git a/mysql-test/suite/rpl/t/rpl_mysql80_stm_temporal_round.test b/mysql-test/suite/rpl/t/rpl_mysql80_stm_temporal_round.test index ad6df9d9993..551764ac220 100644 --- a/mysql-test/suite/rpl/t/rpl_mysql80_stm_temporal_round.test +++ b/mysql-test/suite/rpl/t/rpl_mysql80_stm_temporal_round.test @@ -47,7 +47,7 @@ CREATE TABLE t1 (id SERIAL, a DATETIME(3)); --connection slave --replace_result $SERVER_MYPORT_1 SERVER_MYPORT_1 -eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$SERVER_MYPORT_1, master_user='root', master_log_file='master-bin.000001', master_log_pos=4; +eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$SERVER_MYPORT_1, master_user='root', master_log_file='master-bin.000001', master_log_pos=4, master_use_gtid=no; --source include/start_slave.inc diff --git a/mysql-test/suite/rpl/t/rpl_old_master.test b/mysql-test/suite/rpl/t/rpl_old_master.test index 6ddc227fc14..6faa8212d66 100644 --- a/mysql-test/suite/rpl/t/rpl_old_master.test +++ b/mysql-test/suite/rpl/t/rpl_old_master.test @@ -26,7 +26,7 @@ SET @old_parallel= @@GLOBAL.slave_parallel_threads; SET GLOBAL slave_parallel_threads=10; --replace_result $SERVER_MYPORT_1 SERVER_MYPORT_1 -eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$SERVER_MYPORT_1, master_user='root', master_log_file='master-bin.000001', master_log_pos=4; +eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$SERVER_MYPORT_1, master_user='root', master_log_file='master-bin.000001', master_log_pos=4, master_use_gtid=no; # Block execution yet when the blocked query timestamp has been already accounted FLUSH TABLES WITH READ LOCK; diff --git a/mysql-test/suite/rpl/t/rpl_old_master_29078.test b/mysql-test/suite/rpl/t/rpl_old_master_29078.test index b19fd6466e5..98db6188e96 100644 --- a/mysql-test/suite/rpl/t/rpl_old_master_29078.test +++ b/mysql-test/suite/rpl/t/rpl_old_master_29078.test @@ -23,8 +23,10 @@ create table t2 (a timestamp); --connection slave -set global explicit_defaults_for_timestamp=1; -reset slave; +set global explicit_defaults_for_timestamp=0; +--let $master_use_gtid_option= No +--source include/reset_slave.inc + --source include/start_slave.inc --sync_with_master show create table t1; @@ -34,8 +36,10 @@ select * from t1; drop table t1; --source include/stop_slave.inc -set global explicit_defaults_for_timestamp=0; -reset slave; +set global explicit_defaults_for_timestamp=1; +--let $master_use_gtid_option= No +--source include/reset_slave.inc + --source include/start_slave.inc --sync_with_master show create table t1; diff --git a/mysql-test/suite/rpl/t/rpl_parallel_mdev6589.test b/mysql-test/suite/rpl/t/rpl_parallel_mdev6589.test index 981c6216376..3a5af7bd4a9 100644 --- a/mysql-test/suite/rpl/t/rpl_parallel_mdev6589.test +++ b/mysql-test/suite/rpl/t/rpl_parallel_mdev6589.test @@ -7,7 +7,6 @@ SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; --source include/stop_slave.inc SET GLOBAL slave_parallel_threads=10; -CHANGE MASTER TO master_use_gtid=current_pos; --source include/start_slave.inc diff --git a/mysql-test/suite/rpl/t/rpl_parallel_multilevel2.test b/mysql-test/suite/rpl/t/rpl_parallel_multilevel2.test index 4125394ef80..da8a996f570 100644 --- a/mysql-test/suite/rpl/t/rpl_parallel_multilevel2.test +++ b/mysql-test/suite/rpl/t/rpl_parallel_multilevel2.test @@ -25,7 +25,6 @@ SET GLOBAL binlog_commit_wait_usec=2000000; SET @old_updates= @@GLOBAL.binlog_direct_non_transactional_updates; SET GLOBAL binlog_direct_non_transactional_updates=OFF; SET SESSION binlog_direct_non_transactional_updates=OFF; -CHANGE MASTER TO master_use_gtid=current_pos; --connection server_3 --sync_with_master @@ -33,7 +32,6 @@ CHANGE MASTER TO master_use_gtid=current_pos; SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; --source include/stop_slave.inc SET GLOBAL slave_parallel_threads=10; -CHANGE MASTER TO master_use_gtid=current_pos; --connection server_1 diff --git a/mysql-test/suite/rpl/t/rpl_parallel_temptable.test b/mysql-test/suite/rpl/t/rpl_parallel_temptable.test index edb854842e1..3684763dad7 100644 --- a/mysql-test/suite/rpl/t/rpl_parallel_temptable.test +++ b/mysql-test/suite/rpl/t/rpl_parallel_temptable.test @@ -12,7 +12,6 @@ SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; --source include/stop_slave.inc SET GLOBAL slave_parallel_threads=5; -CHANGE MASTER TO master_use_gtid= current_pos; --source include/start_slave.inc --connection server_1 diff --git a/mysql-test/suite/rpl/t/rpl_perfschema_applier_status_by_coordinator.test b/mysql-test/suite/rpl/t/rpl_perfschema_applier_status_by_coordinator.test index d4f185812e0..44df3ca4ea7 100644 --- a/mysql-test/suite/rpl/t/rpl_perfschema_applier_status_by_coordinator.test +++ b/mysql-test/suite/rpl/t/rpl_perfschema_applier_status_by_coordinator.test @@ -212,6 +212,7 @@ reset master; --source include/stop_slave.inc reset slave; reset master; +set @@global.gtid_slave_pos= ""; set @saved_slave_trans_retry_interval= @@GLOBAL.slave_transaction_retry_interval; set global slave_transaction_retry_interval=1; --source include/start_slave.inc diff --git a/mysql-test/suite/rpl/t/rpl_read_new_relay_log_info.test b/mysql-test/suite/rpl/t/rpl_read_new_relay_log_info.test index 1e2c8ce2d9f..350071bf3dc 100644 --- a/mysql-test/suite/rpl/t/rpl_read_new_relay_log_info.test +++ b/mysql-test/suite/rpl/t/rpl_read_new_relay_log_info.test @@ -12,7 +12,8 @@ DROP TABLE t1; --echo ==== Check that we can understand the new format of relay-log.info ==== --source include/stop_slave.inc -RESET SLAVE; +--let $master_use_gtid_option= No +--source include/reset_slave.inc --let $MYSQLD_DATADIR= `select @@datadir` # the new version of relay_log.info comes in two versions: with path @@ -20,6 +21,10 @@ RESET SLAVE; if ($SYSTEM_PATH_SEPARATOR != /) { --let $file_suffix= -win } + +# MDEV-19801 changed the default Using_Gtid to Slave_Pos which doesn't +# automatically purge relay-log.info +--remove_file $MYSQLD_DATADIR/relay-log.info --copy_file $MYSQL_TEST_DIR/std_data/new-format-relay-log$file_suffix.info $MYSQLD_DATADIR/relay-log.info --echo # Read relay-log.info diff --git a/mysql-test/suite/rpl/t/rpl_read_old_relay_log_info.test b/mysql-test/suite/rpl/t/rpl_read_old_relay_log_info.test index ce345445c08..d2206b5bef7 100644 --- a/mysql-test/suite/rpl/t/rpl_read_old_relay_log_info.test +++ b/mysql-test/suite/rpl/t/rpl_read_old_relay_log_info.test @@ -13,7 +13,8 @@ DROP TABLE t1; --echo ==== Check that we still understand the old format of relay-log.info ==== --source include/stop_slave.inc -RESET SLAVE; +--let $master_use_gtid_option= No +--source include/reset_slave.inc --let $MYSQLD_DATADIR= `select @@datadir` # the old version of relay_log.info comes in two versions: with path @@ -21,6 +22,9 @@ RESET SLAVE; if ($SYSTEM_PATH_SEPARATOR != /) { --let $file_suffix= -win } +# MDEV-19801 changed the default Using_Gtid to Slave_Pos which doesn't +# automatically purge relay-log.info +--remove_file $MYSQLD_DATADIR/relay-log.info --copy_file $MYSQL_TEST_DIR/std_data/old-format-relay-log$file_suffix.info $MYSQLD_DATADIR/relay-log.info --echo # Read relay-log.info diff --git a/mysql-test/suite/rpl/t/rpl_reset_slave_fail.test b/mysql-test/suite/rpl/t/rpl_reset_slave_fail.test index 021dc76d50c..5c7e667695c 100644 --- a/mysql-test/suite/rpl/t/rpl_reset_slave_fail.test +++ b/mysql-test/suite/rpl/t/rpl_reset_slave_fail.test @@ -67,7 +67,7 @@ START SLAVE; # Disable "Warning 1612 Being purged log ./slave-relay-bin.0* was not found" # because it is different on Unix and Windows systems. --disable_warnings -RESET SLAVE; +--source include/reset_slave.inc --enable_warnings DROP TABLE t1; --replace_result $master_exec_file MASTER_LOG_FILE $master_exec_pos MASTER_LOG_POS diff --git a/mysql-test/suite/rpl/t/rpl_row_001.test b/mysql-test/suite/rpl/t/rpl_row_001.test index f66c61ffb6e..887c0961a63 100644 --- a/mysql-test/suite/rpl/t/rpl_row_001.test +++ b/mysql-test/suite/rpl/t/rpl_row_001.test @@ -14,7 +14,7 @@ connection master; RESET MASTER; connection slave; STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc connection master; let $1=5000; diff --git a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test index a249043fa19..9e10aaa6216 100644 --- a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test +++ b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test @@ -100,7 +100,7 @@ stop slave; connection master; reset master; connection slave; -reset slave; +--source include/reset_slave.inc start slave; --source include/wait_for_slave_to_start.inc connection master; @@ -167,7 +167,7 @@ stop slave; connection master; reset master; connection slave; -reset slave; +--source include/reset_slave.inc start slave; --source include/wait_for_slave_to_start.inc connection master; @@ -230,7 +230,7 @@ stop slave; connection master; reset master; connection slave; -reset slave; +--source include/reset_slave.inc start slave; --source include/wait_for_slave_to_start.inc connection master; diff --git a/mysql-test/suite/rpl/t/rpl_row_until.test b/mysql-test/suite/rpl/t/rpl_row_until.test index 478c2206a5a..d318e0d7d26 100644 --- a/mysql-test/suite/rpl/t/rpl_row_until.test +++ b/mysql-test/suite/rpl/t/rpl_row_until.test @@ -38,7 +38,7 @@ sync_slave_with_master; --source include/stop_slave.inc # Reset slave. -RESET SLAVE; +--source include/reset_slave.inc --replace_result $MASTER_MYPORT MASTER_MYPORT eval CHANGE MASTER TO MASTER_USER='root', MASTER_CONNECT_RETRY=1, MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT; @@ -102,7 +102,7 @@ START SLAVE UNTIL RELAY_LOG_FILE='slave-relay-bin.000002', MASTER_LOG_POS=561; START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=740; --source include/stop_slave.inc -RESET SLAVE; +--source include/reset_slave.inc --source include/start_slave.inc ############################################################################## diff --git a/mysql-test/suite/rpl/t/rpl_seconds_behind_master_spike.test b/mysql-test/suite/rpl/t/rpl_seconds_behind_master_spike.test index d1bfbf25bae..600ba9b18d7 100644 --- a/mysql-test/suite/rpl/t/rpl_seconds_behind_master_spike.test +++ b/mysql-test/suite/rpl/t/rpl_seconds_behind_master_spike.test @@ -25,6 +25,12 @@ --source include/master-slave.inc --connection slave + +# Using_Gtid needs to start as NO before updating debug_dbug +--source include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +--source include/start_slave.inc + --source include/stop_slave.inc SET @save_dbug= @@GLOBAL.debug_dbug; SET @@global.debug_dbug="+d,pause_sql_thread_on_fde"; diff --git a/mysql-test/suite/rpl/t/rpl_server_id2.test b/mysql-test/suite/rpl/t/rpl_server_id2.test index 6a8493ca278..6dc2f791954 100644 --- a/mysql-test/suite/rpl/t/rpl_server_id2.test +++ b/mysql-test/suite/rpl/t/rpl_server_id2.test @@ -2,7 +2,12 @@ # from itself, if running with --replicate-same-server-id. source include/master-slave.inc; + connection slave; +--source include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +--source include/start_slave.inc + create table t1 (n int); reset master; # replicate ourselves diff --git a/mysql-test/suite/rpl/t/rpl_server_id_ignore.test b/mysql-test/suite/rpl/t/rpl_server_id_ignore.test index 537978f1701..dbe7544bbb1 100644 --- a/mysql-test/suite/rpl/t/rpl_server_id_ignore.test +++ b/mysql-test/suite/rpl/t/rpl_server_id_ignore.test @@ -38,7 +38,7 @@ change master to IGNORE_SERVER_IDS= (10, 100); --echo *** must be 10, 100 *** let $ignore_list= query_get_value(SHOW SLAVE STATUS, Replicate_Ignore_Server_Ids, 1); echo ignore server id list: $ignore_list; -reset slave; +--source include/reset_slave.inc --echo *** must be empty due to reset slave *** let $ignore_list= query_get_value(SHOW SLAVE STATUS, Replicate_Ignore_Server_Ids, 1); echo ignore server id list: $ignore_list; @@ -80,7 +80,7 @@ if (`select $slave_relay_pos1 - $slave_relay_pos0`) stop slave; source include/wait_for_slave_to_stop.inc; -reset slave; +--source include/reset_slave.inc change master to IGNORE_SERVER_IDS= (10, 100); --echo *** the list must remain (10, 100) after reset slave *** let $ignore_list= query_get_value(SHOW SLAVE STATUS, Replicate_Ignore_Server_Ids, 1); diff --git a/mysql-test/suite/rpl/t/rpl_slave_alias_replica.test b/mysql-test/suite/rpl/t/rpl_slave_alias_replica.test index 324821a325f..06cf12ab7a9 100644 --- a/mysql-test/suite/rpl/t/rpl_slave_alias_replica.test +++ b/mysql-test/suite/rpl/t/rpl_slave_alias_replica.test @@ -65,6 +65,7 @@ STOP REPLICA SQL_THREAD; --source include/wait_for_slave_sql_to_stop.inc --echo "Command: RESET SLAVE ALL --> RESET REPLICA ALL" RESET REPLICA ALL; +set @@global.gtid_slave_pos= ""; --connection master RESET MASTER; diff --git a/mysql-test/suite/rpl/t/rpl_slave_max_statement_time.test b/mysql-test/suite/rpl/t/rpl_slave_max_statement_time.test new file mode 100644 index 00000000000..b600c8434d5 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_slave_max_statement_time.test @@ -0,0 +1,110 @@ +# +# Purpose: +# This test ensures that the slave can limit the execution time of its +# events via the global system variable @@slave_max_statement_time. +# +# Methodology: +# This test uses the following test cases to ensure that a slave will +# correctly limit the execution time of its events: +# 1) Using a serial slave, the SQL thread should time out when its underlying +# event executes for longer than @@slave_max_statement_time. +# 2) Using a parallel slave, a worker thread should time out when its +# underlying event executes for longer than @@slave_max_statement_time. +# 3) Load-based log events (from LOAD DATA INFILE) should time out if their +# execution time exceeds @@slave_max_statement_time +# 4) Locally executed long running statements should not time out due to +# @@slave_max_statement_time. +# +# References: +# MDEV-27161: Add option for SQL thread to limit maximum execution time per +# query replicated +# +--source include/have_innodb.inc +--source include/master-slave.inc + +--echo # +--echo # Set up +--echo # +--connection master +SET STATEMENT sql_log_bin=0 FOR CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format"); +SET STATEMENT sql_log_bin=0 FOR CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format"); +--connection slave +SET STATEMENT sql_log_bin=0 FOR CALL mtr.add_suppression("Slave log event execution was interrupted"); +SET STATEMENT sql_log_bin=0 FOR CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format"); +SET @save_slave_max_statement_time=@@GLOBAL.slave_max_statement_time; + +--let $with_lock= 1 + +--echo # +--echo # Test Case 1) Using a serial slave, the SQL thread should time out when +--echo # its underlying event executes for longer than @@slave_max_statement_time. +--echo # +--source include/rpl_slave_max_statement_time.inc + + +--echo # +--echo # Test Case 2) Using a parallel slave, a worker thread should time out +--echo # when its underlying event executes for longer than +--echo # @@slave_max_statement_time +--echo # + +--source include/stop_slave.inc +SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; +SET @old_parallel_mode=@@GLOBAL.slave_parallel_mode; +SET GLOBAL slave_parallel_threads=2; +SET GLOBAL slave_parallel_mode='optimistic'; +--source include/start_slave.inc + +--source include/rpl_slave_max_statement_time.inc + +--source include/stop_slave.inc +SET GLOBAL slave_parallel_mode=@old_parallel_mode; +SET GLOBAL slave_parallel_threads=@old_parallel_threads; +--source include/start_slave.inc + + +--echo # +--echo # Test Case 3) Load-based log events (from LOAD DATA INFILE) should time +--echo # out if their execution time exceeds @@slave_max_statement_time +--echo # +--let $use_load_data= 1 +--source include/rpl_slave_max_statement_time.inc +--let $use_load_data= + + +--echo # +--echo # Test Case 4) Locally executed long running statements should not time +--echo # out due to @@slave_max_statement_time +--echo # + +--connection slave +--source include/stop_slave.inc +SET @old_slave_max_statement_time=@@GLOBAL.slave_max_statement_time; +SET @old_gtid_domain_id=@@GLOBAL.gtid_domain_id; +SET @@GLOBAL.slave_max_statement_time=0.75; +SET @@GLOBAL.gtid_domain_id=1; +--source include/start_slave.inc + +CREATE TABLE t2 (a int); +SET STATEMENT sql_log_bin=0 FOR INSERT INTO t2 SELECT SLEEP(1); +--let $t2_count= `SELECT COUNT(*) FROM t2` +if ($t2_count != 1) +{ + --die Local long running insert statement should have completed +} +DROP TABLE t2; + +--source include/stop_slave.inc +SET GLOBAL gtid_domain_id=@old_gtid_domain_id; +SET GLOBAL slave_max_statement_time=@old_slave_max_statement_time; +--source include/start_slave.inc + + +--echo # Cleanup +--source include/stop_slave.inc +SET GLOBAL slave_max_statement_time=@save_slave_max_statement_time; +--source include/start_slave.inc + +--source include/rpl_end.inc + +--echo # End of rpl_slave_max_statement_time.test diff --git a/mysql-test/suite/rpl/t/rpl_slave_skip.test b/mysql-test/suite/rpl/t/rpl_slave_skip.test index 2ec80758486..933e7d14f9b 100644 --- a/mysql-test/suite/rpl/t/rpl_slave_skip.test +++ b/mysql-test/suite/rpl/t/rpl_slave_skip.test @@ -55,7 +55,7 @@ SELECT * FROM t2; STOP SLAVE; --source include/wait_for_slave_to_stop.inc -RESET SLAVE; +--source include/reset_slave.inc connection master; RESET MASTER; diff --git a/mysql-test/suite/rpl/t/rpl_start_alter_mysqlbinlog_1.test b/mysql-test/suite/rpl/t/rpl_start_alter_mysqlbinlog_1.test index 5c78eb290c8..f655d3c10ba 100644 --- a/mysql-test/suite/rpl/t/rpl_start_alter_mysqlbinlog_1.test +++ b/mysql-test/suite/rpl/t/rpl_start_alter_mysqlbinlog_1.test @@ -1,6 +1,6 @@ # # Start Alter with binlog applied using mysqlbinlog -# single maser with only one domain id +# single master with only one domain id # --source include/have_innodb.inc --source include/have_debug.inc @@ -10,7 +10,6 @@ set global binlog_alter_two_phase=true; --connection slave --source include/stop_slave.inc -change master to master_use_gtid= current_pos; set global gtid_strict_mode=1; --echo # Legacy Master Slave diff --git a/mysql-test/suite/rpl/t/rpl_start_alter_restart_master.test b/mysql-test/suite/rpl/t/rpl_start_alter_restart_master.test index eaddaa4db67..aac3af6fc14 100644 --- a/mysql-test/suite/rpl/t/rpl_start_alter_restart_master.test +++ b/mysql-test/suite/rpl/t/rpl_start_alter_restart_master.test @@ -10,6 +10,11 @@ --source include/no_valgrind_without_big.inc --connection slave +--source include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +--source include/start_slave.inc + +--connection slave SET @old_debug_slave= @@global.debug; stop slave; --let $gtid_strict_mode= `select @@gtid_strict_mode` diff --git a/mysql-test/suite/rpl/t/rpl_stm_000001.test b/mysql-test/suite/rpl/t/rpl_stm_000001.test index 62b5c5b1cd0..3851e61868b 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_000001.test +++ b/mysql-test/suite/rpl/t/rpl_stm_000001.test @@ -53,7 +53,7 @@ connection master; reset master; connection slave; stop slave; -reset slave; +--source include/reset_slave.inc connection master; let $1=5000; diff --git a/mysql-test/suite/rpl/t/rpl_stm_until.test b/mysql-test/suite/rpl/t/rpl_stm_until.test index c9a922e44fa..ebfd355b299 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_until.test +++ b/mysql-test/suite/rpl/t/rpl_stm_until.test @@ -19,6 +19,7 @@ -- source include/have_binlog_format_mixed_or_statement.inc -- source include/master-slave.inc +--let $master_use_gtid_option= No -- source include/rpl_reset.inc # Test is dependent on binlog positions @@ -127,7 +128,7 @@ source include/stop_slave.inc; --disable_warnings drop table if exists t1; --enable_warnings -reset slave; +--source include/reset_slave.inc --replace_result $MASTER_MYPORT MASTER_PORT eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root'; diff --git a/mysql-test/suite/rpl/t/rpl_stop_slave.test b/mysql-test/suite/rpl/t/rpl_stop_slave.test index 17efa7ade3b..14c6641f120 100644 --- a/mysql-test/suite/rpl/t/rpl_stop_slave.test +++ b/mysql-test/suite/rpl/t/rpl_stop_slave.test @@ -4,6 +4,12 @@ source include/have_debug_sync.inc; source include/have_binlog_format_mixed_or_statement.inc; source include/master-slave.inc; +--connection slave +--source include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +--source include/start_slave.inc +--connection master + --echo --echo # BUG#56118 STOP SLAVE does not wait till trx with CREATE TMP TABLE ends --echo # diff --git a/mysql-test/suite/rpl/t/rpl_trigger.test b/mysql-test/suite/rpl/t/rpl_trigger.test index f692816bf82..e442ed94d5a 100644 --- a/mysql-test/suite/rpl/t/rpl_trigger.test +++ b/mysql-test/suite/rpl/t/rpl_trigger.test @@ -5,6 +5,12 @@ --source include/have_binlog_format_mixed_or_statement.inc --source include/have_innodb.inc --source include/master-slave.inc + +connection slave; +--source include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +--source include/start_slave.inc + connection master; disable_query_log; @@ -329,7 +335,8 @@ let $binlog_version= query_get_value(SHOW BINLOG EVENTS, Info, 1); # Make the slave to replay the new binlog. connection slave; -RESET SLAVE; +--let $master_use_gtid_option= No +--source include/reset_slave.inc START SLAVE; SELECT MASTER_POS_WAIT('master-bin.000001', 513) >= 0; @@ -362,7 +369,7 @@ DROP TABLE t1; DROP TABLE t2; STOP SLAVE; -RESET SLAVE; +--source include/reset_slave.inc # The master should be clean. @@ -498,6 +505,10 @@ connection master; --source include/rpl_reset.inc connection slave; +--source include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +--source include/start_slave.inc + connection master; create table t1 ( f int ) engine = innodb; diff --git a/mysql-test/suite/rpl/t/rpl_upgrade_master_info.test b/mysql-test/suite/rpl/t/rpl_upgrade_master_info.test index 42b375c4579..fb0e3cf48f7 100644 --- a/mysql-test/suite/rpl/t/rpl_upgrade_master_info.test +++ b/mysql-test/suite/rpl/t/rpl_upgrade_master_info.test @@ -4,7 +4,6 @@ --connection slave --source include/stop_slave.inc -CHANGE MASTER TO master_use_gtid=CURRENT_POS; --let $datadir= `SELECT @@datadir` --let $rpl_server_number= 2 diff --git a/mysql-test/suite/rpl/t/rpl_using_gtid_default.test b/mysql-test/suite/rpl/t/rpl_using_gtid_default.test new file mode 100644 index 00000000000..eab5b4dd504 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_using_gtid_default.test @@ -0,0 +1,303 @@ +# +# Purpose: +# This test ensures that a replica's default value for Using_Gtid is set +# correctly. Specifically, it should default to 'Slave_Pos' unless the primary +# server does not support GTIDs (if its version is less than 10), in which case +# the replica should fall back to 'No'. +# +# Methodology: +# Validate the value of Using_Gtid on replica initialization and after +# RESET SLAVE commands. Specifically, we validate the following use cases: +# +# Case 1) A replica will initialize with Slave_Pos if the primary supports +# GTIDs +# Case 2) A replica configured with the Using_Gtid=Slave_Pos issued +# RESET SLAVE will preserve Using_Gtid without any informational +# messages. +# Case 3) A replica configured with Using_Gtid=No against a master which +# supports GTIDs will revert to Using_Gtid=Slave_Pos after issued +# RESET SLAVE and provide an informational note +# Case 4) A fresh replica targeting a primary which does not support GTIDs +# will fall back to Using_Gtid=No when starting. An informational +# message should be logged. +# Case 5) A replica connected to a primary which does not support GTIDs +# should preserve Using_Gtid=No when issued RESET SLAVE. No message +# should be provided to the user. +# Case 6) A replica configured with Using_Gtid=Current_Pos should revert +# to Slave_Pos when issued RESET SLAVE. An informational message +# should be provided to the user. +# Case 7) The MTR include file rpl_change_topology.inc should implicitly +# set MASTER_USE_GTID=NO when provided with $rpl_master_log_file +# Case 8) The MTR include file reset_slave.inc should keep/delete GTID state +# when reset_slave_keep_gtid_state is set, respectively. +# Case 9) A replica issued CHANGE MASTER TO specified with log coordinates +# but not master_use_gtid=No should warn the user that Using_Gtid is +# being changed to No. +# Case 10) A replica issued CHANGE MASTER TO specified with log coordinates +# and master_use_gtid=Slave_Pos should warn the user that the log +# coordinates will be ignored. +# +# References: +# MDEV-19801: Change defaults for CHANGE MASTER TO so that GTID-based +# replication is used by default if master supports it +# +--source include/have_debug.inc +--source include/master-slave.inc + +# Format independent test so just use one +--source include/have_binlog_format_mixed.inc + +--echo # +--echo # Slave default configuration should be Slave_Pos +--let $expected_default_using_gtid= Slave_Pos +--connection slave +--let $using_gtid= query_get_value(SHOW SLAVE STATUS, Using_Gtid, 1) +if ($using_gtid != $expected_default_using_gtid) +{ + --die Using_Gtid had wrong default value of '$using_gtid' when it should have been '$expected_default_using_gtid' +} + +--echo # +--echo # Ensure that a slave configured with Using_Gtid=Slave_Pos will remain +--echo # as Slave_Pos after RESET SLAVE +--source include/stop_slave.inc +RESET SLAVE; +--echo # No warning should be given because Slave_Pos never changed +SHOW WARNINGS; +--source include/start_slave.inc +--let $using_gtid= query_get_value(SHOW SLAVE STATUS, Using_Gtid, 1) +if ($using_gtid != $expected_default_using_gtid) +{ + --die Using_Gtid has wrong value of '$using_gtid' when it should be '$expected_default_using_gtid' +} + + +--echo # +--echo # Ensure that a slave configured with Using_Gtid=No will revert to its +--echo # default of Slave_Pos after RESET SLAVE for a master which supports +--echo # GTIDs + +--source include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=NO; +--source include/start_slave.inc +--source include/stop_slave.inc +RESET SLAVE; +--echo # A notification that Using_Gtid was reverted should exist +SHOW WARNINGS; +--source include/start_slave.inc +--let $using_gtid= query_get_value(SHOW SLAVE STATUS, Using_Gtid, 1) +if ($using_gtid != $expected_default_using_gtid) +{ + --die Using_Gtid has wrong value of '$using_gtid' when it should be '$expected_default_using_gtid' +} + +--echo # Clear SHOW WARNINGS +--disable_query_log +set SQL_LOG_BIN=0; +CREATE TABLE t1 (a int); +DROP TABLE t1; +set SQL_LOG_BIN=1; +--enable_query_log + + +--echo # +--echo # If the primary does not support GTIDs (version < 10), the replica +--echo # should fall back to Using_Gtid=No on slave start, and should not +--echo # revert Using_Gtid to Slave_Pos after RESET SLAVE + +--source include/stop_slave.inc +RESET SLAVE ALL; + +--replace_result $MASTER_MYPORT MASTER_MYPORT +--eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT, MASTER_USER='root', MASTER_CONNECT_RETRY=1 +SET @saved_dbug= @@GLOBAL.debug_dbug; +set @@global.debug_dbug= "d,mock_mariadb_primary_v5_in_get_master_version"; +--source include/start_slave.inc + +--echo # Replica should detect at start that the primary does not support GTIDs +--echo # and fall-back to Using_Gtid=No +--let $using_gtid= query_get_value(SHOW SLAVE STATUS, Using_Gtid, 1) +if ($using_gtid != 'No') +{ + --die Using_Gtid has wrong value of '$using_gtid' when it should be 'No' +} + +--echo # Replica should have an informational message stating it is falling +--echo # back to Using_Gtid=No +let $log_error_= `SELECT @@GLOBAL.log_error`; +if(!$log_error_) +{ + # MySQL Server on windows is started with --console and thus + # does not know the location of its .err log, use default location + let $log_error_ = $MYSQLTEST_VARDIR/log/mysqld.2.err; +} +--let SEARCH_FILE=$log_error_ +--let SEARCH_PATTERN=Falling back to Using_Gtid=No because master does not support GTIDs +--source include/search_pattern_in_file.inc + +--source include/stop_slave.inc +RESET SLAVE; + +--echo # Replica should know that the primary does not support GTIDs and +--echo # preserve Using_Gtid=No +--let $using_gtid= query_get_value(SHOW SLAVE STATUS, Using_Gtid, 1) +if ($using_gtid != 'No') +{ + --die Using_Gtid has wrong value of '$using_gtid' when it should be 'No' +} +--echo # 'No' was not reverted and therefore no note should be added +SHOW WARNINGS; +set @@global.debug_dbug= @saved_dbug; +--source include/start_slave.inc + + +--echo # +--echo # Ensure that a slave configured with Using_Gtid=Current_Pos will revert +--echo # to its default of Slave_Pos after RESET SLAVE. + +--source include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=Current_Pos; +--source include/start_slave.inc +--source include/stop_slave.inc +RESET SLAVE; +--echo # A notification that Using_Gtid was reverted should exist +SHOW WARNINGS; +--source include/start_slave.inc +--let $using_gtid= query_get_value(SHOW SLAVE STATUS, Using_Gtid, 1) +if ($using_gtid != $expected_default_using_gtid) +{ + --die Using_Gtid has wrong value of '$using_gtid' when it should be '$expected_default_using_gtid' +} + +--echo # Clear SHOW WARNINGS +--disable_query_log +set SQL_LOG_BIN=0; +CREATE TABLE t1 (a int); +DROP TABLE t1; +set SQL_LOG_BIN=1; +--enable_query_log + +--echo # The MTR include file rpl_change_topology.inc should implicitly set +--echo # MASTER_USE_GTID=NO when provided with \$rpl_master_log_file. Note that +--echo # this will switch master and slave roles. +--connection slave +--source include/stop_slave.inc +--let $pos_c= query_get_value(SHOW SLAVE STATUS, Exec_Master_Log_Pos, 1) +--let $file_c= query_get_value(SHOW SLAVE STATUS, Master_Log_File, 1) +--let $rpl_master_log_file= 2:$file_c +--let $rpl_master_log_pos= 2:$pos_c +--let $rpl_topology= 2->1 +--source include/rpl_change_topology.inc + +--echo # connection 'master' is the slave in this comparison +--connection master +--let $using_gtid= query_get_value(SHOW SLAVE STATUS, Using_Gtid, 1) +--echo # Validating Using_Gtid=No.. +if (`SELECT strcmp("$using_gtid","No") != 0`) +{ + --die Using_Gtid should be No when calling rpl_change_topology with \$rpl_master_log_file set +} +--echo # ..success + +--let $rpl_master_log_file= +--let $rpl_topology= 1->2 +--source include/rpl_change_topology.inc + +--echo # connection 'slave' is back to slave role +--connection slave +--let $using_gtid= query_get_value(SHOW SLAVE STATUS, Using_Gtid, 1) +--echo # Validating Using_Gtid=$expected_default_using_gtid.. +if (`SELECT strcmp("$using_gtid","$expected_default_using_gtid")!= 0`) +{ + --die Using_Gtid should be back to $expected_default_using_gtid with empty \$rpl_master_log_file +} +--echo # ..success +--source include/start_slave.inc + +--echo # +--echo # The MTR include file reset_slave.inc should keep/delete GTID state +--echo # when reset_slave_keep_gtid_state is set, respectively. +--echo # +--connection master +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES (1); +DROP TABLE t1; +--source include/save_master_gtid.inc + +--connection slave +--source include/sync_with_master_gtid.inc +--source include/stop_slave.inc + +--echo # Tagging gtid_slave_pos before reset_slave.inc as old_slave_pos +--let $old_slave_pos= `SELECT @@gtid_slave_pos` +if (`SELECT strcmp("$old_slave_pos","") = 0`) +{ + die gtid_slave_pos is empty but should not be; +} + +--echo # Using reset_slave_keep_gtid_state=1 should preserve GTID state +--let $master_use_gtid_option=Slave_Pos +--let $reset_slave_keep_gtid_state=1 +--source include/reset_slave.inc + +--echo # Tagging gtid_slave_pos after reset_slave.inc as new_slave_pos +--let $new_slave_pos= `SELECT @@gtid_slave_pos` +--echo # Validating old_slave_pos == new_slave_pos.. +if ($old_slave_pos != $new_slave_pos) +{ + die gtid_slave_pos unexpectedly changed after running reset_slave.inc; +} +--echo # ..success + +--echo # Using reset_slave_keep_gtid_state=0 should empty GTID state +--let $master_use_gtid_option=Slave_Pos +--let $reset_slave_keep_gtid_state=0 +--source include/reset_slave.inc + +--echo # Tagging gtid_slave_pos as new_slave_pos +--let $new_slave_pos= `SELECT @@gtid_slave_pos` +--echo # Validating new_slave_pos is empty.. +if (`SELECT strcmp("$new_slave_pos","") != 0`) +{ + die gtid_slave_pos should be empty after reset_slave.inc without keeping gtid state; +} +--echo # ..success +--replace_result $old_slave_pos old_slave_pos +eval set global gtid_slave_pos="$old_slave_pos"; +--source include/start_slave.inc + +--echo # +--echo # A replica issued CHANGE MASTER TO specified with log coordinates but +--echo # not master_use_gtid=no should warn the user that Using_Gtid is being +--echo # changed to No. +--echo # +--connection slave +--let $io_log_pos= query_get_value('SHOW SLAVE STATUS', Read_Master_Log_Pos, 1) +--let $io_log_file= query_get_value('SHOW SLAVE STATUS', Master_Log_File, 1) +--source include/stop_slave.inc +--replace_result $io_log_file io_log_file $io_log_pos io_log_pos +--eval CHANGE MASTER TO master_log_pos=$io_log_pos, master_log_file='$io_log_file' +--source include/start_slave.inc + + +--echo # +--echo # A replica issued CHANGE MASTER TO specified with log coordinates and +--echo # master_use_gtid=Slave_Pos should warn the user that the log +--echo # coordinates will be ignored. +--echo # +--connection slave +--let $io_log_pos= query_get_value('SHOW SLAVE STATUS', Read_Master_Log_Pos, 1) +--let $io_log_file= query_get_value('SHOW SLAVE STATUS', Master_Log_File, 1) +--let $relay_log_pos= 4 +--let $relay_log_file= slave-relay-bin.000001 +--source include/stop_slave.inc +--replace_result $io_log_file io_log_file $io_log_pos io_log_pos +--eval CHANGE MASTER TO master_log_pos=$io_log_pos, master_log_file='$io_log_file', master_use_gtid=Slave_Pos +--replace_result $relay_log_file relay_log_file $relay_log_pos relay_log_pos +--eval CHANGE MASTER TO relay_log_pos=$relay_log_pos, relay_log_file='$relay_log_file', master_use_gtid=Slave_Pos +--source include/start_slave.inc + +--source include/rpl_end.inc + +--echo # +--echo # End of rpl_using_gtid_default.test diff --git a/mysql-test/suite/rpl/t/rpl_xa_gap_lock.test b/mysql-test/suite/rpl/t/rpl_xa_gap_lock.test index 9c48891b889..29e883a19d6 100644 --- a/mysql-test/suite/rpl/t/rpl_xa_gap_lock.test +++ b/mysql-test/suite/rpl/t/rpl_xa_gap_lock.test @@ -129,7 +129,7 @@ DROP TABLE t2, t1; # --enable_query_log #} --replace_result $master_file LOG_FILE $master_pos LOG_POS ---eval CHANGE MASTER TO MASTER_LOG_FILE='$master_file', MASTER_LOG_POS=$master_pos +--eval CHANGE MASTER TO MASTER_LOG_FILE='$master_file', MASTER_LOG_POS=$master_pos, MASTER_USE_GTID=NO SET @@GLOBAL.innodb_limit_optimistic_insert_debug = @saved_innodb_limit_optimistic_insert_debug; --source include/start_slave.inc diff --git a/mysql-test/suite/rpl/t/semisync_future-7591.test b/mysql-test/suite/rpl/t/semisync_future-7591.test index 866041d2579..793d8bccc18 100644 --- a/mysql-test/suite/rpl/t/semisync_future-7591.test +++ b/mysql-test/suite/rpl/t/semisync_future-7591.test @@ -8,7 +8,7 @@ set global rpl_semi_sync_master_enabled = ON; --connection slave --source include/stop_slave.inc set global rpl_semi_sync_slave_enabled = ON; -change master to master_log_file='master-bin.000002', master_log_pos = 320; +change master to master_log_file='master-bin.000002', master_log_pos = 320, master_use_gtid=no; start slave; --let $slave_io_errno=1236 @@ -20,7 +20,8 @@ reset master; --connection slave --source include/stop_slave.inc -reset slave; +--let $master_use_gtid_option= No +--source include/reset_slave.inc --source include/start_slave.inc set global rpl_semi_sync_slave_enabled = OFF; diff --git a/mysql-test/suite/sql_sequence/gtid.result b/mysql-test/suite/sql_sequence/gtid.result index 5c0003d4ea3..f23ebc56688 100644 --- a/mysql-test/suite/sql_sequence/gtid.result +++ b/mysql-test/suite/sql_sequence/gtid.result @@ -68,7 +68,7 @@ connection master; create sequence s2; alter table s2 add id int; ERROR HY000: Sequence 's_db.s2' table structure is invalid (Wrong number of columns) -alter table s2 add index ind_x(start); +alter table s2 add index ind_x(start_value); ERROR HY000: Sequence 's_db.s2' table structure is invalid (Sequence tables cannot have any keys) drop sequence s2; ########################################### diff --git a/mysql-test/suite/sql_sequence/gtid.test b/mysql-test/suite/sql_sequence/gtid.test index 63ed7ec5264..4a096246108 100644 --- a/mysql-test/suite/sql_sequence/gtid.test +++ b/mysql-test/suite/sql_sequence/gtid.test @@ -70,7 +70,7 @@ create sequence s2; alter table s2 add id int; --error ER_SEQUENCE_INVALID_TABLE_STRUCTURE -alter table s2 add index ind_x(start); +alter table s2 add index ind_x(start_value); drop sequence s2; --echo ########################################### diff --git a/mysql-test/suite/sql_sequence/replication.result b/mysql-test/suite/sql_sequence/replication.result index 762c332dbd6..94b1c72b9e0 100644 --- a/mysql-test/suite/sql_sequence/replication.result +++ b/mysql-test/suite/sql_sequence/replication.result @@ -64,7 +64,7 @@ connection master; create sequence s2; alter table s2 add id int; ERROR HY000: Sequence 's_db.s2' table structure is invalid (Wrong number of columns) -alter table s2 add index ind_x(start); +alter table s2 add index ind_x(start_value); ERROR HY000: Sequence 's_db.s2' table structure is invalid (Sequence tables cannot have any keys) drop sequence s2; ########################################### diff --git a/mysql-test/suite/sql_sequence/replication.test b/mysql-test/suite/sql_sequence/replication.test index e26fde8a329..0354737788f 100644 --- a/mysql-test/suite/sql_sequence/replication.test +++ b/mysql-test/suite/sql_sequence/replication.test @@ -70,7 +70,7 @@ create sequence s2; alter table s2 add id int; --error ER_SEQUENCE_INVALID_TABLE_STRUCTURE -alter table s2 add index ind_x(start); +alter table s2 add index ind_x(start_value); drop sequence s2; --echo ########################################### diff --git a/mysql-test/suite/sys_vars/r/allow_suspicious_udfs.result b/mysql-test/suite/sys_vars/r/allow_suspicious_udfs.result new file mode 100644 index 00000000000..db0b4749e69 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/allow_suspicious_udfs.result @@ -0,0 +1,11 @@ +# +# MDEV-24815 Show "--allow-suspicious-udfs" state in SYSTEM VARIABLES +# +SELECT @@allow_suspicious_udfs AS EXPECT_0; +EXPECT_0 +0 +# restart: --allow-suspicious-udfs +SELECT @@allow_suspicious_udfs AS EXPECT_1; +EXPECT_1 +1 +# restart: --skip-allow-suspicious-udfs diff --git a/mysql-test/suite/sys_vars/r/innodb_prefix_index_cluster_optimization_basic.result b/mysql-test/suite/sys_vars/r/innodb_prefix_index_cluster_optimization_basic.result deleted file mode 100644 index 57b653bcf5e..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_prefix_index_cluster_optimization_basic.result +++ /dev/null @@ -1,122 +0,0 @@ -SET @start_global_value = @@global.innodb_prefix_index_cluster_optimization; -SELECT @start_global_value; -@start_global_value -0 -# -# exists as global only -# -Valid values are 'ON' and 'OFF' -select @@global.innodb_prefix_index_cluster_optimization in (0, 1); -@@global.innodb_prefix_index_cluster_optimization in (0, 1) -1 -select @@global.innodb_prefix_index_cluster_optimization; -@@global.innodb_prefix_index_cluster_optimization -0 -select @@session.innodb_prefix_index_cluster_optimization; -ERROR HY000: Variable 'innodb_prefix_index_cluster_optimization' is a GLOBAL variable -show global variables like 'innodb_prefix_index_cluster_optimization'; -Variable_name Value -innodb_prefix_index_cluster_optimization OFF -show session variables like 'innodb_prefix_index_cluster_optimization'; -Variable_name Value -innodb_prefix_index_cluster_optimization OFF -select * from information_schema.global_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_PREFIX_INDEX_CLUSTER_OPTIMIZATION OFF -select * from information_schema.session_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_PREFIX_INDEX_CLUSTER_OPTIMIZATION OFF -# -# show that it's writable -# -set global innodb_prefix_index_cluster_optimization = 'OFF'; -select @@global.innodb_prefix_index_cluster_optimization; -@@global.innodb_prefix_index_cluster_optimization -0 -select * from information_schema.global_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_PREFIX_INDEX_CLUSTER_OPTIMIZATION OFF -select * from information_schema.session_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_PREFIX_INDEX_CLUSTER_OPTIMIZATION OFF -set @@global.innodb_prefix_index_cluster_optimization = 'ON'; -select @@global.innodb_prefix_index_cluster_optimization; -@@global.innodb_prefix_index_cluster_optimization -1 -select * from information_schema.global_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_PREFIX_INDEX_CLUSTER_OPTIMIZATION ON -select * from information_schema.session_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_PREFIX_INDEX_CLUSTER_OPTIMIZATION ON -set global innodb_prefix_index_cluster_optimization = 0; -select @@global.innodb_prefix_index_cluster_optimization; -@@global.innodb_prefix_index_cluster_optimization -0 -select * from information_schema.global_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_PREFIX_INDEX_CLUSTER_OPTIMIZATION OFF -select * from information_schema.session_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_PREFIX_INDEX_CLUSTER_OPTIMIZATION OFF -set @@global.innodb_prefix_index_cluster_optimization = 1; -select @@global.innodb_prefix_index_cluster_optimization; -@@global.innodb_prefix_index_cluster_optimization -1 -select * from information_schema.global_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_PREFIX_INDEX_CLUSTER_OPTIMIZATION ON -select * from information_schema.session_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_PREFIX_INDEX_CLUSTER_OPTIMIZATION ON -set session innodb_prefix_index_cluster_optimization = 'OFF'; -ERROR HY000: Variable 'innodb_prefix_index_cluster_optimization' is a GLOBAL variable and should be set with SET GLOBAL -select @@global.innodb_prefix_index_cluster_optimization; -@@global.innodb_prefix_index_cluster_optimization -1 -select * from information_schema.global_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_PREFIX_INDEX_CLUSTER_OPTIMIZATION ON -select * from information_schema.session_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_PREFIX_INDEX_CLUSTER_OPTIMIZATION ON -set @@session.innodb_prefix_index_cluster_optimization = 'ON'; -ERROR HY000: Variable 'innodb_prefix_index_cluster_optimization' is a GLOBAL variable and should be set with SET GLOBAL -select @@global.innodb_prefix_index_cluster_optimization; -@@global.innodb_prefix_index_cluster_optimization -1 -select * from information_schema.global_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_PREFIX_INDEX_CLUSTER_OPTIMIZATION ON -select * from information_schema.session_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_PREFIX_INDEX_CLUSTER_OPTIMIZATION ON -# -# incorrect types -# -set global innodb_prefix_index_cluster_optimization = 1.1; -ERROR 42000: Incorrect argument type to variable 'innodb_prefix_index_cluster_optimization' -set global innodb_prefix_index_cluster_optimization = 1e1; -ERROR 42000: Incorrect argument type to variable 'innodb_prefix_index_cluster_optimization' -set global innodb_prefix_index_cluster_optimization = 2; -ERROR 42000: Variable 'innodb_prefix_index_cluster_optimization' can't be set to the value of '2' -set global innodb_prefix_index_cluster_optimization = -3; -ERROR 42000: Variable 'innodb_prefix_index_cluster_optimization' can't be set to the value of '-3' -select @@global.innodb_prefix_index_cluster_optimization; -@@global.innodb_prefix_index_cluster_optimization -1 -select * from information_schema.global_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_PREFIX_INDEX_CLUSTER_OPTIMIZATION ON -select * from information_schema.session_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_PREFIX_INDEX_CLUSTER_OPTIMIZATION ON -set global innodb_prefix_index_cluster_optimization = 'AUTO'; -ERROR 42000: Variable 'innodb_prefix_index_cluster_optimization' can't be set to the value of 'AUTO' -# -# Cleanup -# -SET @@global.innodb_prefix_index_cluster_optimization = @start_global_value; -SELECT @@global.innodb_prefix_index_cluster_optimization; -@@global.innodb_prefix_index_cluster_optimization -0 diff --git a/mysql-test/suite/sys_vars/r/innodb_version_basic.result b/mysql-test/suite/sys_vars/r/innodb_version_basic.result deleted file mode 100644 index 759b5048512..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_version_basic.result +++ /dev/null @@ -1,17 +0,0 @@ -select @@global.innodb_version; -@@global.innodb_version -x.y.z -select @@session.innodb_version; -ERROR HY000: Variable 'innodb_version' is a GLOBAL variable -show global variables like 'innodb_version' disabled so to not change with every version; -show session variables like 'innodb_version' disabled so to not change with every version; -select VARIABLE_VALUE=@@global.innodb_version from information_schema.global_variables where variable_name='innodb_version'; -VARIABLE_VALUE=@@global.innodb_version -1 -select VARIABLE_VALUE=@@global.innodb_version from information_schema.session_variables where variable_name='innodb_version'; -VARIABLE_VALUE=@@global.innodb_version -1 -set global innodb_version=1; -ERROR HY000: Variable 'innodb_version' is a read only variable -set session innodb_version=1; -ERROR HY000: Variable 'innodb_version' is a read only variable diff --git a/mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result b/mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result index 99843f0b93f..b4763ae0aa4 100644 --- a/mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result +++ b/mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result @@ -1,35 +1,35 @@ SET @start_global_value = @@global.optimizer_prune_level; SELECT @start_global_value; @start_global_value -1 +2 SET @start_session_value = @@session.optimizer_prune_level; SELECT @start_session_value; @start_session_value -1 +2 '#--------------------FN_DYNVARS_115_01-------------------------#' SET @@global.optimizer_prune_level = 0; SET @@global.optimizer_prune_level = DEFAULT; SELECT @@global.optimizer_prune_level; @@global.optimizer_prune_level -1 +2 SET @@session.optimizer_prune_level = 0; SET @@session.optimizer_prune_level = DEFAULT; SELECT @@session.optimizer_prune_level; @@session.optimizer_prune_level -1 +2 '#--------------------FN_DYNVARS_115_02-------------------------#' SET @@global.optimizer_prune_level = DEFAULT; -SELECT @@global.optimizer_prune_level = 1; -@@global.optimizer_prune_level = 1 +SELECT @@global.optimizer_prune_level = 2; +@@global.optimizer_prune_level = 2 1 SET @@session.optimizer_prune_level = DEFAULT; -SELECT @@session.optimizer_prune_level = 1; -@@session.optimizer_prune_level = 1 +SELECT @@session.optimizer_prune_level = 2; +@@session.optimizer_prune_level = 2 1 '#--------------------FN_DYNVARS_115_03-------------------------#' SELECT @@global.optimizer_prune_level; @@global.optimizer_prune_level -1 +2 SET @@global.optimizer_prune_level = 0; SELECT @@global.optimizer_prune_level; @@global.optimizer_prune_level @@ -38,6 +38,10 @@ SET @@global.optimizer_prune_level = 1; SELECT @@global.optimizer_prune_level; @@global.optimizer_prune_level 1 +SET @@global.optimizer_prune_level = 2; +SELECT @@global.optimizer_prune_level; +@@global.optimizer_prune_level +2 SET @@global.optimizer_prune_level = TRUE; SELECT @@global.optimizer_prune_level; @@global.optimizer_prune_level @@ -49,7 +53,7 @@ SELECT @@global.optimizer_prune_level; '#--------------------FN_DYNVARS_115_04-------------------------#' SELECT @@session.optimizer_prune_level; @@session.optimizer_prune_level -1 +2 SET @@session.optimizer_prune_level = 0; SELECT @@session.optimizer_prune_level; @@session.optimizer_prune_level @@ -58,6 +62,10 @@ SET @@session.optimizer_prune_level = 1; SELECT @@session.optimizer_prune_level; @@session.optimizer_prune_level 1 +SET @@session.optimizer_prune_level = 2; +SELECT @@session.optimizer_prune_level; +@@session.optimizer_prune_level +2 SET @@session.optimizer_prune_level = TRUE; SELECT @@session.optimizer_prune_level; @@session.optimizer_prune_level @@ -69,7 +77,7 @@ SELECT @@session.optimizer_prune_level; '#------------------FN_DYNVARS_115_05-----------------------#' SET @@global.optimizer_prune_level = ON; ERROR 42000: Incorrect argument type to variable 'optimizer_prune_level' -'Bug# 34840: Since it is a boolean variable, it should not give errors on 'ON' & 'OFF' values'; +'Bug# 34840: Since it is not a boolean variable, it should give errors on 'ON' & 'OFF' values'; SET @@global.optimizer_prune_level = OFF; ERROR 42000: Incorrect argument type to variable 'optimizer_prune_level' SET @@global.optimizer_prune_level = 'ONN'; @@ -86,10 +94,16 @@ Warning 1292 Truncated incorrect optimizer_prune_level value: '-1024' SELECT @@global.optimizer_prune_level; @@global.optimizer_prune_level 0 -'Bug# 34840: Since it is a boolean variable, it should give errors on numeric values'; +'Bug# 34840: Since it is not a boolean variable, it should no give errors on numeric values'; SET @@global.optimizer_prune_level = 65536; Warnings: Warning 1292 Truncated incorrect optimizer_prune_level value: '65536' +SET @@global.optimizer_prune_level = 3; +Warnings: +Warning 1292 Truncated incorrect optimizer_prune_level value: '3' +select @@global.optimizer_prune_level; +@@global.optimizer_prune_level +2 SET @@global.optimizer_prune_level = 65530.34; ERROR 42000: Incorrect argument type to variable 'optimizer_prune_level' SET @@global.optimizer_prune_level = test; @@ -121,7 +135,7 @@ Warnings: Warning 1292 Truncated incorrect optimizer_prune_level value: '65550' SELECT @@session.optimizer_prune_level; @@session.optimizer_prune_level -1 +2 SET @@session.optimizer_prune_level = test; ERROR 42000: Incorrect argument type to variable 'optimizer_prune_level' '#------------------FN_DYNVARS_115_06-----------------------#' @@ -164,8 +178,8 @@ ERROR 42S22: Unknown column 'optimizer_prune_level' in 'field list' SET @@global.optimizer_prune_level = @start_global_value; SELECT @@global.optimizer_prune_level; @@global.optimizer_prune_level -1 +2 SET @@session.optimizer_prune_level = @start_session_value; SELECT @@session.optimizer_prune_level; @@session.optimizer_prune_level -1 +2 diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result index 8b95878c347..42803695813 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result @@ -1,7 +1,6 @@ select VARIABLE_NAME, SESSION_VALUE, DEFAULT_VALUE, VARIABLE_SCOPE, VARIABLE_TYPE, VARIABLE_COMMENT, NUMERIC_MIN_VALUE, NUMERIC_MAX_VALUE, NUMERIC_BLOCK_SIZE, ENUM_VALUE_LIST, READ_ONLY, COMMAND_LINE_ARGUMENT from information_schema.system_variables where variable_name like 'innodb%' and variable_name not in ( -'innodb_version', # always the same as the server version 'innodb_numa_interleave', # only available WITH_NUMA 'innodb_evict_tables_on_commit_debug', # one may want to override this 'innodb_use_native_aio', # default value depends on OS @@ -1258,10 +1257,10 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME INNODB_PREFIX_INDEX_CLUSTER_OPTIMIZATION SESSION_VALUE NULL -DEFAULT_VALUE OFF +DEFAULT_VALUE ON VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Enable prefix optimization to sometimes avoid cluster index lookups. +VARIABLE_COMMENT Deprecated parameter with no effect NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff index a6bf0fb606a..e018489446b 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff @@ -1,4 +1,4 @@ -@@ -34,7 +34,7 @@ +@@ -44,7 +44,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_BLOCK_SIZE VARIABLE_SCOPE GLOBAL @@ -7,7 +7,7 @@ VARIABLE_COMMENT Block size to be used for Aria index pages. NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 32768 -@@ -44,7 +44,7 @@ +@@ -54,7 +54,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_CHECKPOINT_INTERVAL VARIABLE_SCOPE GLOBAL @@ -16,7 +16,7 @@ VARIABLE_COMMENT Interval between tries to do an automatic checkpoints. In seconds; 0 means 'no automatic checkpoints' which makes sense only for testing. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -54,7 +54,7 @@ +@@ -64,7 +64,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_CHECKPOINT_LOG_ACTIVITY VARIABLE_SCOPE GLOBAL @@ -25,7 +25,7 @@ VARIABLE_COMMENT Number of bytes that the transaction log has to grow between checkpoints before a new checkpoint is written to the log. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -74,7 +74,7 @@ +@@ -84,7 +84,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME ARIA_FORCE_START_AFTER_RECOVERY_FAILURES VARIABLE_SCOPE GLOBAL @@ -34,7 +34,7 @@ VARIABLE_COMMENT Number of consecutive log recovery failures after which logs will be automatically deleted to cure the problem; 0 (the default) disables the feature. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 -@@ -94,7 +94,7 @@ +@@ -104,7 +104,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_GROUP_COMMIT_INTERVAL VARIABLE_SCOPE GLOBAL @@ -43,7 +43,7 @@ VARIABLE_COMMENT Interval between commits in microseconds (1/1000000 sec). 0 stands for no waiting for other threads to come and do a commit in "hard" mode and no sync()/commit at all in "soft" mode. Option has only an effect if aria_group_commit is used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -104,7 +104,7 @@ +@@ -114,7 +114,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_LOG_FILE_SIZE VARIABLE_SCOPE GLOBAL @@ -52,7 +52,7 @@ VARIABLE_COMMENT Limit for transaction log size NUMERIC_MIN_VALUE 8388608 NUMERIC_MAX_VALUE 4294967295 -@@ -134,10 +134,10 @@ +@@ -144,10 +144,10 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_PAGECACHE_AGE_THRESHOLD VARIABLE_SCOPE GLOBAL @@ -65,7 +65,7 @@ NUMERIC_BLOCK_SIZE 100 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -154,7 +154,7 @@ +@@ -164,7 +164,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_PAGECACHE_DIVISION_LIMIT VARIABLE_SCOPE GLOBAL @@ -74,7 +74,7 @@ VARIABLE_COMMENT The minimum percentage of warm blocks in key cache NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 100 -@@ -164,7 +164,7 @@ +@@ -174,7 +174,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_PAGECACHE_FILE_HASH_SIZE VARIABLE_SCOPE GLOBAL @@ -83,7 +83,7 @@ VARIABLE_COMMENT Number of hash buckets for open and changed files. If you have a lot of Aria files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open Aria files. NUMERIC_MIN_VALUE 128 NUMERIC_MAX_VALUE 16384 -@@ -194,7 +194,7 @@ +@@ -204,7 +204,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME ARIA_REPAIR_THREADS VARIABLE_SCOPE SESSION @@ -92,7 +92,7 @@ VARIABLE_COMMENT Number of threads to use when repairing Aria tables. The value of 1 disables parallel repair. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 128 -@@ -207,7 +207,7 @@ +@@ -217,7 +217,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE. NUMERIC_MIN_VALUE 4096 @@ -101,7 +101,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -264,7 +264,7 @@ +@@ -274,7 +274,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME AUTO_INCREMENT_INCREMENT VARIABLE_SCOPE SESSION @@ -110,7 +110,7 @@ VARIABLE_COMMENT Auto-increment columns are incremented by this NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 65535 -@@ -274,7 +274,7 @@ +@@ -284,7 +284,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME AUTO_INCREMENT_OFFSET VARIABLE_SCOPE SESSION @@ -119,7 +119,7 @@ VARIABLE_COMMENT Offset added to Auto-increment columns. Used when auto-increment-increment != 1 NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 65535 -@@ -284,7 +284,7 @@ +@@ -294,7 +294,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME BACK_LOG VARIABLE_SCOPE GLOBAL @@ -128,7 +128,7 @@ VARIABLE_COMMENT The number of outstanding connection requests MariaDB can have. This comes into play when the main MariaDB thread gets very many connection requests in a very short time NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65535 -@@ -337,7 +337,7 @@ +@@ -347,7 +347,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the transactional cache for updates to transactional engines for the binary log. If you often use transactions containing many statements, you can increase this to get more performance NUMERIC_MIN_VALUE 4096 @@ -137,7 +137,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -354,20 +354,20 @@ +@@ -364,20 +364,20 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BINLOG_COMMIT_WAIT_COUNT VARIABLE_SCOPE GLOBAL @@ -162,7 +162,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -384,7 +384,7 @@ +@@ -394,7 +394,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME BINLOG_EXPIRE_LOGS_SECONDS VARIABLE_SCOPE GLOBAL @@ -171,7 +171,7 @@ VARIABLE_COMMENT If non-zero, binary logs will be purged after binlog_expire_logs_seconds seconds; It and expire_logs_days are linked, such that changes in one are converted into the other. Possible purges happen at startup and at binary log rotation. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 8553600 -@@ -397,7 +397,7 @@ +@@ -407,7 +407,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of file cache for the binary log NUMERIC_MIN_VALUE 8192 @@ -180,7 +180,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -447,7 +447,7 @@ +@@ -457,7 +457,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the statement cache for updates to non-transactional engines for the binary log. If you often use statements updating a great number of rows, you can increase this to get more performance. NUMERIC_MIN_VALUE 4096 @@ -189,7 +189,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -457,7 +457,7 @@ +@@ -467,7 +467,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Size of tree cache used in bulk insert optimisation. Note that this is a limit per thread! NUMERIC_MIN_VALUE 0 @@ -198,7 +198,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -644,7 +644,7 @@ +@@ -654,7 +654,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME CONNECT_TIMEOUT VARIABLE_SCOPE GLOBAL @@ -207,7 +207,7 @@ VARIABLE_COMMENT The number of seconds the mysqld server is waiting for a connect packet before responding with 'Bad handshake' NUMERIC_MIN_VALUE 2 NUMERIC_MAX_VALUE 31536000 -@@ -694,7 +694,7 @@ +@@ -704,7 +704,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_SEARCH_DEPTH_LONG VARIABLE_SCOPE SESSION @@ -216,7 +216,7 @@ VARIABLE_COMMENT Long search depth for the two-step deadlock detection NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 33 -@@ -704,7 +704,7 @@ +@@ -714,7 +714,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_SEARCH_DEPTH_SHORT VARIABLE_SCOPE SESSION @@ -225,7 +225,7 @@ VARIABLE_COMMENT Short search depth for the two-step deadlock detection NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 32 -@@ -714,7 +714,7 @@ +@@ -724,7 +724,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_TIMEOUT_LONG VARIABLE_SCOPE SESSION @@ -234,7 +234,7 @@ VARIABLE_COMMENT Long timeout for the two-step deadlock detection (in microseconds) NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -724,7 +724,7 @@ +@@ -734,7 +734,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_TIMEOUT_SHORT VARIABLE_SCOPE SESSION @@ -243,7 +243,7 @@ VARIABLE_COMMENT Short timeout for the two-step deadlock detection (in microseconds) NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -774,7 +774,7 @@ +@@ -784,7 +784,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME DEFAULT_WEEK_FORMAT VARIABLE_SCOPE SESSION @@ -252,7 +252,7 @@ VARIABLE_COMMENT The default week format used by WEEK() functions NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 7 -@@ -784,7 +784,7 @@ +@@ -794,7 +794,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DELAYED_INSERT_LIMIT VARIABLE_SCOPE GLOBAL @@ -261,7 +261,7 @@ VARIABLE_COMMENT After inserting delayed_insert_limit rows, the INSERT DELAYED handler will check if there are any SELECT statements pending. If so, it allows these to execute before continuing. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -794,7 +794,7 @@ +@@ -804,7 +804,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DELAYED_INSERT_TIMEOUT VARIABLE_SCOPE GLOBAL @@ -270,7 +270,7 @@ VARIABLE_COMMENT How long a INSERT DELAYED thread should wait for INSERT statements before terminating NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -804,7 +804,7 @@ +@@ -814,7 +814,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DELAYED_QUEUE_SIZE VARIABLE_SCOPE GLOBAL @@ -279,7 +279,7 @@ VARIABLE_COMMENT What size queue (in rows) should be allocated for handling INSERT DELAYED. If the queue becomes full, any client that does INSERT DELAYED will wait until there is room in the queue again NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -834,7 +834,7 @@ +@@ -844,7 +844,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME DIV_PRECISION_INCREMENT VARIABLE_SCOPE SESSION @@ -288,7 +288,7 @@ VARIABLE_COMMENT Precision of the result of '/' operator will be increased on that value NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 38 -@@ -944,7 +944,7 @@ +@@ -954,7 +954,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME EXTRA_MAX_CONNECTIONS VARIABLE_SCOPE GLOBAL @@ -297,7 +297,7 @@ VARIABLE_COMMENT The number of connections on extra-port NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 100000 -@@ -974,7 +974,7 @@ +@@ -984,7 +984,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME FLUSH_TIME VARIABLE_SCOPE GLOBAL @@ -306,7 +306,7 @@ VARIABLE_COMMENT A dedicated thread is created to flush all tables at the given interval NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -1004,7 +1004,7 @@ +@@ -1014,7 +1014,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME FT_MAX_WORD_LEN VARIABLE_SCOPE GLOBAL @@ -315,7 +315,7 @@ VARIABLE_COMMENT The maximum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 84 -@@ -1014,7 +1014,7 @@ +@@ -1024,7 +1024,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME FT_MIN_WORD_LEN VARIABLE_SCOPE GLOBAL @@ -324,7 +324,7 @@ VARIABLE_COMMENT The minimum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 84 -@@ -1024,7 +1024,7 @@ +@@ -1034,7 +1034,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME FT_QUERY_EXPANSION_LIMIT VARIABLE_SCOPE GLOBAL @@ -333,7 +333,7 @@ VARIABLE_COMMENT Number of best matches to use for query expansion NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1000 -@@ -1194,7 +1194,7 @@ +@@ -1204,7 +1204,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME HISTOGRAM_SIZE VARIABLE_SCOPE SESSION @@ -342,7 +342,7 @@ VARIABLE_COMMENT Number of bytes used for a histogram. If set to 0, no histograms are created by ANALYZE. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 -@@ -1224,7 +1224,7 @@ +@@ -1234,7 +1234,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME HOST_CACHE_SIZE VARIABLE_SCOPE GLOBAL @@ -351,7 +351,7 @@ VARIABLE_COMMENT How many host names should be cached to avoid resolving. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65536 -@@ -1334,7 +1334,7 @@ +@@ -1344,7 +1344,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME INTERACTIVE_TIMEOUT VARIABLE_SCOPE SESSION @@ -360,7 +360,7 @@ VARIABLE_COMMENT The number of seconds the server waits for activity on an interactive connection before closing it NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -1367,7 +1367,7 @@ +@@ -1377,7 +1377,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the buffer that is used for joins NUMERIC_MIN_VALUE 128 @@ -369,7 +369,7 @@ NUMERIC_BLOCK_SIZE 128 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1384,7 +1384,7 @@ +@@ -1394,7 +1394,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME JOIN_CACHE_LEVEL VARIABLE_SCOPE SESSION @@ -378,7 +378,7 @@ VARIABLE_COMMENT Controls what join operations can be executed with join buffers. Odd numbers are used for plain join buffers while even numbers are used for linked buffers NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 8 -@@ -1407,7 +1407,7 @@ +@@ -1417,7 +1417,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the buffer used for index blocks for MyISAM tables. Increase this to get better index handling (for all reads and multiple writes) to as much as you can afford NUMERIC_MIN_VALUE 0 @@ -387,7 +387,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1564,7 +1564,7 @@ +@@ -1574,7 +1574,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME LOCK_WAIT_TIMEOUT VARIABLE_SCOPE SESSION @@ -396,7 +396,7 @@ VARIABLE_COMMENT Timeout in seconds to wait for a lock before returning an error. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -1684,7 +1684,7 @@ +@@ -1694,7 +1694,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_SLOW_RATE_LIMIT VARIABLE_SCOPE SESSION @@ -405,7 +405,7 @@ VARIABLE_COMMENT Write to slow log every #th slow query. Set to 1 to log everything. Increase it to reduce the size of the slow or the performance impact of slow logging NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -1714,7 +1714,7 @@ +@@ -1724,7 +1724,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_WARNINGS VARIABLE_SCOPE SESSION @@ -414,7 +414,7 @@ VARIABLE_COMMENT Log some not critical warnings to the general log file.Value can be between 0 and 11. Higher values mean more verbosity NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -1764,7 +1764,7 @@ +@@ -1774,7 +1774,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME MAX_ALLOWED_PACKET VARIABLE_SCOPE SESSION @@ -423,7 +423,7 @@ VARIABLE_COMMENT Max packet length to send to or receive from the server NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -1777,14 +1777,14 @@ +@@ -1787,14 +1787,14 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the total size of the transactional cache NUMERIC_MIN_VALUE 4096 @@ -440,7 +440,7 @@ VARIABLE_COMMENT Binary log will be rotated automatically when the size exceeds this value. NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 1073741824 -@@ -1797,14 +1797,14 @@ +@@ -1807,14 +1807,14 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the total size of the statement cache NUMERIC_MIN_VALUE 4096 @@ -457,7 +457,7 @@ VARIABLE_COMMENT The number of simultaneous clients allowed NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 100000 -@@ -1814,7 +1814,7 @@ +@@ -1824,7 +1824,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_CONNECT_ERRORS VARIABLE_SCOPE GLOBAL @@ -466,7 +466,7 @@ VARIABLE_COMMENT If there is more than this number of interrupted connections from a host this host will be blocked from further connections NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -1824,7 +1824,7 @@ +@@ -1834,7 +1834,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_DELAYED_THREADS VARIABLE_SCOPE SESSION @@ -475,7 +475,7 @@ VARIABLE_COMMENT Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -1844,7 +1844,7 @@ +@@ -1854,7 +1854,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_ERROR_COUNT VARIABLE_SCOPE SESSION @@ -484,7 +484,7 @@ VARIABLE_COMMENT Max number of errors/warnings to store for a statement NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65535 -@@ -1857,14 +1857,14 @@ +@@ -1867,14 +1867,14 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Don't allow creation of heap tables bigger than this NUMERIC_MIN_VALUE 16384 @@ -501,7 +501,7 @@ VARIABLE_COMMENT Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -1884,7 +1884,7 @@ +@@ -1894,7 +1894,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_LENGTH_FOR_SORT_DATA VARIABLE_SCOPE SESSION @@ -510,7 +510,7 @@ VARIABLE_COMMENT Max number of bytes in sorted records NUMERIC_MIN_VALUE 4 NUMERIC_MAX_VALUE 8388608 -@@ -1914,7 +1914,7 @@ +@@ -1924,7 +1924,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_RECURSIVE_ITERATIONS VARIABLE_SCOPE SESSION @@ -519,7 +519,7 @@ VARIABLE_COMMENT Maximum number of iterations when executing recursive queries NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -1927,14 +1927,14 @@ +@@ -1937,14 +1937,14 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The maximum size of the container of a rowid filter NUMERIC_MIN_VALUE 1024 @@ -536,7 +536,7 @@ VARIABLE_COMMENT Limit assumed max number of seeks when looking up rows based on a key NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -1954,7 +1954,7 @@ +@@ -1964,7 +1964,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_SORT_LENGTH VARIABLE_SCOPE SESSION @@ -545,7 +545,7 @@ VARIABLE_COMMENT The number of bytes to use when sorting BLOB or TEXT values (only the first max_sort_length bytes of each value are used; the rest are ignored) NUMERIC_MIN_VALUE 64 NUMERIC_MAX_VALUE 8388608 -@@ -1964,7 +1964,7 @@ +@@ -1974,7 +1974,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_SP_RECURSION_DEPTH VARIABLE_SCOPE SESSION @@ -554,7 +554,7 @@ VARIABLE_COMMENT Maximum stored procedure recursion depth NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 -@@ -1984,7 +1984,7 @@ +@@ -1994,7 +1994,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_TMP_TABLES VARIABLE_SCOPE SESSION @@ -563,7 +563,7 @@ VARIABLE_COMMENT Unused, will be removed. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2004,7 +2004,7 @@ +@@ -2014,7 +2014,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_WRITE_LOCK_COUNT VARIABLE_SCOPE GLOBAL @@ -572,7 +572,7 @@ VARIABLE_COMMENT After this many write locks, allow some read locks to run in between NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2014,7 +2014,7 @@ +@@ -2024,7 +2024,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME METADATA_LOCKS_CACHE_SIZE VARIABLE_SCOPE GLOBAL @@ -581,7 +581,7 @@ VARIABLE_COMMENT Unused NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1048576 -@@ -2024,7 +2024,7 @@ +@@ -2034,7 +2034,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME METADATA_LOCKS_HASH_INSTANCES VARIABLE_SCOPE GLOBAL @@ -590,7 +590,7 @@ VARIABLE_COMMENT Unused NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1024 -@@ -2034,7 +2034,7 @@ +@@ -2044,7 +2044,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MIN_EXAMINED_ROW_LIMIT VARIABLE_SCOPE SESSION @@ -599,7 +599,7 @@ VARIABLE_COMMENT Don't write queries to slow log that examine fewer rows than that NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2044,7 +2044,7 @@ +@@ -2054,7 +2054,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MRR_BUFFER_SIZE VARIABLE_SCOPE SESSION @@ -608,7 +608,7 @@ VARIABLE_COMMENT Size of buffer to use when using MRR with range access NUMERIC_MIN_VALUE 8192 NUMERIC_MAX_VALUE 2147483647 -@@ -2054,7 +2054,7 @@ +@@ -2064,7 +2064,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MYISAM_BLOCK_SIZE VARIABLE_SCOPE GLOBAL @@ -617,7 +617,7 @@ VARIABLE_COMMENT Block size to be used for MyISAM index pages NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 16384 -@@ -2064,7 +2064,7 @@ +@@ -2074,7 +2074,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MYISAM_DATA_POINTER_SIZE VARIABLE_SCOPE GLOBAL @@ -626,7 +626,7 @@ VARIABLE_COMMENT Default pointer size to be used for MyISAM tables NUMERIC_MIN_VALUE 2 NUMERIC_MAX_VALUE 7 -@@ -2087,7 +2087,7 @@ +@@ -2097,7 +2097,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Restricts the total memory used for memory mapping of MySQL tables NUMERIC_MIN_VALUE 7 @@ -635,7 +635,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY YES -@@ -2104,10 +2104,10 @@ +@@ -2114,10 +2114,10 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME MYISAM_REPAIR_THREADS VARIABLE_SCOPE SESSION @@ -648,7 +648,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2117,7 +2117,7 @@ +@@ -2127,7 +2127,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE NUMERIC_MIN_VALUE 4096 @@ -657,7 +657,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2154,7 +2154,7 @@ +@@ -2164,7 +2164,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME NET_BUFFER_LENGTH VARIABLE_SCOPE SESSION @@ -666,7 +666,7 @@ VARIABLE_COMMENT Buffer length for TCP/IP and socket communication NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1048576 -@@ -2164,7 +2164,7 @@ +@@ -2174,7 +2174,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME NET_READ_TIMEOUT VARIABLE_SCOPE SESSION @@ -675,7 +675,7 @@ VARIABLE_COMMENT Number of seconds to wait for more data from a connection before aborting the read NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -2174,7 +2174,7 @@ +@@ -2184,7 +2184,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME NET_RETRY_COUNT VARIABLE_SCOPE SESSION @@ -684,7 +684,7 @@ VARIABLE_COMMENT If a read on a communication port is interrupted, retry this many times before giving up NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2184,7 +2184,7 @@ +@@ -2194,7 +2194,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME NET_WRITE_TIMEOUT VARIABLE_SCOPE SESSION @@ -693,7 +693,7 @@ VARIABLE_COMMENT Number of seconds to wait for a block to be written to a connection before aborting the write NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -2234,7 +2234,7 @@ +@@ -2244,7 +2244,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME OPEN_FILES_LIMIT VARIABLE_SCOPE GLOBAL @@ -702,7 +702,16 @@ VARIABLE_COMMENT If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 or autoset then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2244,17 +2244,17 @@ +@@ -2254,7 +2254,7 @@ + COMMAND_LINE_ARGUMENT REQUIRED + VARIABLE_NAME OPTIMIZER_EXTRA_PRUNING_DEPTH + VARIABLE_SCOPE SESSION +-VARIABLE_TYPE BIGINT UNSIGNED ++VARIABLE_TYPE INT UNSIGNED + VARIABLE_COMMENT If the optimizer needs to enumerate join prefix of this size or larger, then it will try agressively prune away the search space. + NUMERIC_MIN_VALUE 0 + NUMERIC_MAX_VALUE 62 +@@ -2264,17 +2264,17 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_MAX_SEL_ARG_WEIGHT VARIABLE_SCOPE SESSION @@ -720,10 +729,10 @@ VARIABLE_SCOPE SESSION -VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Controls the heuristic(s) applied during query optimization to prune less-promising partial plans from the optimizer search space. Meaning: 0 - do not apply any heuristic, thus perform exhaustive search; 1 - prune plans based on number of retrieved rows + VARIABLE_COMMENT Controls the heuristic(s) applied during query optimization to prune less-promising partial plans from the optimizer search space. Meaning: 0 - do not apply any heuristic, thus perform exhaustive search: 1 - prune plans based on cost and number of retrieved rows eq_ref: 2 - prune also if we find an eq_ref chain NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 1 -@@ -2264,7 +2264,7 @@ + NUMERIC_MAX_VALUE 2 +@@ -2284,7 +2284,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_SEARCH_DEPTH VARIABLE_SCOPE SESSION @@ -732,7 +741,7 @@ VARIABLE_COMMENT Maximum depth of search performed by the query optimizer. Values larger than the number of relations in a query result in better query plans, but take longer to compile a query. Values smaller than the number of tables in a relation result in faster optimization, but may produce very bad query plans. If set to 0, the system will automatically pick a reasonable value. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 62 -@@ -2274,7 +2274,7 @@ +@@ -2294,7 +2294,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_SELECTIVITY_SAMPLING_LIMIT VARIABLE_SCOPE SESSION @@ -741,7 +750,7 @@ VARIABLE_COMMENT Controls number of record samples to check condition selectivity NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 4294967295 -@@ -2304,17 +2304,17 @@ +@@ -2324,17 +2324,17 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_TRACE_MAX_MEM_SIZE VARIABLE_SCOPE SESSION @@ -762,7 +771,7 @@ VARIABLE_COMMENT Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join.5 - additionally use selectivity of certain non-range predicates calculated on record samples NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 5 -@@ -2334,7 +2334,7 @@ +@@ -2354,7 +2354,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME PERFORMANCE_SCHEMA_ACCOUNTS_SIZE VARIABLE_SCOPE GLOBAL @@ -771,7 +780,7 @@ VARIABLE_COMMENT Maximum number of instrumented user@host accounts. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2344,7 +2344,7 @@ +@@ -2364,7 +2364,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_DIGESTS_SIZE VARIABLE_SCOPE GLOBAL @@ -780,7 +789,7 @@ VARIABLE_COMMENT Size of the statement digest. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2354,7 +2354,7 @@ +@@ -2374,7 +2374,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STAGES_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -789,7 +798,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_STAGES_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2364,7 +2364,7 @@ +@@ -2384,7 +2384,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STAGES_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -798,7 +807,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_STAGES_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2374,7 +2374,7 @@ +@@ -2394,7 +2394,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STATEMENTS_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -807,7 +816,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_STATEMENTS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2384,7 +2384,7 @@ +@@ -2404,7 +2404,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STATEMENTS_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -816,7 +825,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_STATEMENTS_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2394,7 +2394,7 @@ +@@ -2414,7 +2414,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_TRANSACTIONS_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -825,7 +834,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_TRANSACTIONS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2404,7 +2404,7 @@ +@@ -2424,7 +2424,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_TRANSACTIONS_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -834,7 +843,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_TRANSACTIONS_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2414,7 +2414,7 @@ +@@ -2434,7 +2434,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -843,7 +852,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2424,7 +2424,7 @@ +@@ -2444,7 +2444,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -852,7 +861,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_WAITS_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2434,7 +2434,7 @@ +@@ -2454,7 +2454,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_HOSTS_SIZE VARIABLE_SCOPE GLOBAL @@ -861,7 +870,7 @@ VARIABLE_COMMENT Maximum number of instrumented hosts. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2444,7 +2444,7 @@ +@@ -2464,7 +2464,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_COND_CLASSES VARIABLE_SCOPE GLOBAL @@ -870,7 +879,7 @@ VARIABLE_COMMENT Maximum number of condition instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2454,7 +2454,7 @@ +@@ -2474,7 +2474,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_COND_INSTANCES VARIABLE_SCOPE GLOBAL @@ -879,7 +888,7 @@ VARIABLE_COMMENT Maximum number of instrumented condition objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2464,7 +2464,7 @@ +@@ -2484,7 +2484,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_DIGEST_LENGTH VARIABLE_SCOPE GLOBAL @@ -888,7 +897,7 @@ VARIABLE_COMMENT Maximum length considered for digest text, when stored in performance_schema tables. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2474,7 +2474,7 @@ +@@ -2494,7 +2494,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_FILE_CLASSES VARIABLE_SCOPE GLOBAL @@ -897,7 +906,7 @@ VARIABLE_COMMENT Maximum number of file instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2484,7 +2484,7 @@ +@@ -2504,7 +2504,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_FILE_HANDLES VARIABLE_SCOPE GLOBAL @@ -906,7 +915,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented files. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2494,7 +2494,7 @@ +@@ -2514,7 +2514,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_FILE_INSTANCES VARIABLE_SCOPE GLOBAL @@ -915,7 +924,7 @@ VARIABLE_COMMENT Maximum number of instrumented files. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2504,7 +2504,7 @@ +@@ -2524,7 +2524,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_INDEX_STAT VARIABLE_SCOPE GLOBAL @@ -924,7 +933,7 @@ VARIABLE_COMMENT Maximum number of index statistics for instrumented tables. Use 0 to disable, -1 for automated scaling. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2514,7 +2514,7 @@ +@@ -2534,7 +2534,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_MEMORY_CLASSES VARIABLE_SCOPE GLOBAL @@ -933,7 +942,7 @@ VARIABLE_COMMENT Maximum number of memory pool instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1024 -@@ -2524,7 +2524,7 @@ +@@ -2544,7 +2544,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_METADATA_LOCKS VARIABLE_SCOPE GLOBAL @@ -942,7 +951,7 @@ VARIABLE_COMMENT Maximum number of metadata locks. Use 0 to disable, -1 for automated scaling. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 104857600 -@@ -2534,7 +2534,7 @@ +@@ -2554,7 +2554,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_MUTEX_CLASSES VARIABLE_SCOPE GLOBAL @@ -951,7 +960,7 @@ VARIABLE_COMMENT Maximum number of mutex instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2544,7 +2544,7 @@ +@@ -2564,7 +2564,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_MUTEX_INSTANCES VARIABLE_SCOPE GLOBAL @@ -960,7 +969,7 @@ VARIABLE_COMMENT Maximum number of instrumented MUTEX objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 104857600 -@@ -2554,7 +2554,7 @@ +@@ -2574,7 +2574,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_PREPARED_STATEMENTS_INSTANCES VARIABLE_SCOPE GLOBAL @@ -969,7 +978,7 @@ VARIABLE_COMMENT Maximum number of instrumented prepared statements. Use 0 to disable, -1 for automated scaling. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2564,7 +2564,7 @@ +@@ -2584,7 +2584,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_PROGRAM_INSTANCES VARIABLE_SCOPE GLOBAL @@ -978,7 +987,7 @@ VARIABLE_COMMENT Maximum number of instrumented programs. Use 0 to disable, -1 for automated scaling. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2574,7 +2574,7 @@ +@@ -2594,7 +2594,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_RWLOCK_CLASSES VARIABLE_SCOPE GLOBAL @@ -987,7 +996,7 @@ VARIABLE_COMMENT Maximum number of rwlock instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2584,7 +2584,7 @@ +@@ -2604,7 +2604,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_RWLOCK_INSTANCES VARIABLE_SCOPE GLOBAL @@ -996,7 +1005,7 @@ VARIABLE_COMMENT Maximum number of instrumented RWLOCK objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 104857600 -@@ -2594,7 +2594,7 @@ +@@ -2614,7 +2614,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_SOCKET_CLASSES VARIABLE_SCOPE GLOBAL @@ -1005,7 +1014,7 @@ VARIABLE_COMMENT Maximum number of socket instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2604,7 +2604,7 @@ +@@ -2624,7 +2624,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_SOCKET_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1014,7 +1023,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented sockets. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2614,7 +2614,7 @@ +@@ -2634,7 +2634,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_SQL_TEXT_LENGTH VARIABLE_SCOPE GLOBAL @@ -1023,7 +1032,7 @@ VARIABLE_COMMENT Maximum length of displayed sql text. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2624,7 +2624,7 @@ +@@ -2644,7 +2644,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_STAGE_CLASSES VARIABLE_SCOPE GLOBAL @@ -1032,7 +1041,7 @@ VARIABLE_COMMENT Maximum number of stage instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2634,7 +2634,7 @@ +@@ -2654,7 +2654,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_STATEMENT_CLASSES VARIABLE_SCOPE GLOBAL @@ -1041,7 +1050,7 @@ VARIABLE_COMMENT Maximum number of statement instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2644,7 +2644,7 @@ +@@ -2664,7 +2664,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_STATEMENT_STACK VARIABLE_SCOPE GLOBAL @@ -1050,7 +1059,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_STATEMENTS_CURRENT. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 256 -@@ -2654,7 +2654,7 @@ +@@ -2674,7 +2674,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_TABLE_HANDLES VARIABLE_SCOPE GLOBAL @@ -1059,7 +1068,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented tables. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2664,7 +2664,7 @@ +@@ -2684,7 +2684,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_TABLE_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1068,7 +1077,7 @@ VARIABLE_COMMENT Maximum number of instrumented tables. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2674,7 +2674,7 @@ +@@ -2694,7 +2694,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_TABLE_LOCK_STAT VARIABLE_SCOPE GLOBAL @@ -1077,7 +1086,7 @@ VARIABLE_COMMENT Maximum number of lock statistics for instrumented tables. Use 0 to disable, -1 for automated scaling. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2684,7 +2684,7 @@ +@@ -2704,7 +2704,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_THREAD_CLASSES VARIABLE_SCOPE GLOBAL @@ -1086,7 +1095,7 @@ VARIABLE_COMMENT Maximum number of thread instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2694,7 +2694,7 @@ +@@ -2714,7 +2714,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_THREAD_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1095,7 +1104,7 @@ VARIABLE_COMMENT Maximum number of instrumented threads. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2704,7 +2704,7 @@ +@@ -2724,7 +2724,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_SESSION_CONNECT_ATTRS_SIZE VARIABLE_SCOPE GLOBAL @@ -1104,7 +1113,7 @@ VARIABLE_COMMENT Size of session attribute string buffer per thread. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2714,7 +2714,7 @@ +@@ -2734,7 +2734,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_SETUP_ACTORS_SIZE VARIABLE_SCOPE GLOBAL @@ -1113,7 +1122,7 @@ VARIABLE_COMMENT Maximum number of rows in SETUP_ACTORS. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2724,7 +2724,7 @@ +@@ -2744,7 +2744,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_SETUP_OBJECTS_SIZE VARIABLE_SCOPE GLOBAL @@ -1122,7 +1131,7 @@ VARIABLE_COMMENT Maximum number of rows in SETUP_OBJECTS. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2734,7 +2734,7 @@ +@@ -2754,7 +2754,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_USERS_SIZE VARIABLE_SCOPE GLOBAL @@ -1131,7 +1140,7 @@ VARIABLE_COMMENT Maximum number of instrumented users. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2784,7 +2784,7 @@ +@@ -2804,7 +2804,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PRELOAD_BUFFER_SIZE VARIABLE_SCOPE SESSION @@ -1140,7 +1149,7 @@ VARIABLE_COMMENT The size of the buffer that is allocated when preloading indexes NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -2804,7 +2804,7 @@ +@@ -2824,7 +2824,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME PROFILING_HISTORY_SIZE VARIABLE_SCOPE SESSION @@ -1149,7 +1158,7 @@ VARIABLE_COMMENT Number of statements about which profiling information is maintained. If set to 0, no profiles are stored. See SHOW PROFILES. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 100 -@@ -2814,7 +2814,7 @@ +@@ -2834,7 +2834,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PROGRESS_REPORT_TIME VARIABLE_SCOPE SESSION @@ -1158,7 +1167,7 @@ VARIABLE_COMMENT Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2874,7 +2874,7 @@ +@@ -2894,7 +2894,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME QUERY_ALLOC_BLOCK_SIZE VARIABLE_SCOPE SESSION @@ -1167,7 +1176,7 @@ VARIABLE_COMMENT Allocation block size for query parsing and execution NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 4294967295 -@@ -2884,7 +2884,7 @@ +@@ -2904,7 +2904,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME QUERY_CACHE_LIMIT VARIABLE_SCOPE GLOBAL @@ -1176,7 +1185,7 @@ VARIABLE_COMMENT Don't cache results that are bigger than this NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2894,7 +2894,7 @@ +@@ -2914,7 +2914,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME QUERY_CACHE_MIN_RES_UNIT VARIABLE_SCOPE GLOBAL @@ -1185,7 +1194,7 @@ VARIABLE_COMMENT The minimum size for blocks allocated by the query cache NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2907,7 +2907,7 @@ +@@ -2927,7 +2927,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The memory allocated to store results from old queries NUMERIC_MIN_VALUE 0 @@ -1194,7 +1203,7 @@ NUMERIC_BLOCK_SIZE 1024 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2944,7 +2944,7 @@ +@@ -2964,7 +2964,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME QUERY_PREALLOC_SIZE VARIABLE_SCOPE SESSION @@ -1203,7 +1212,7 @@ VARIABLE_COMMENT Persistent buffer for query parsing and execution NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 4294967295 -@@ -2957,7 +2957,7 @@ +@@ -2977,7 +2977,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes NUMERIC_MIN_VALUE 0 @@ -1212,7 +1221,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2967,14 +2967,14 @@ +@@ -2987,14 +2987,14 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes NUMERIC_MIN_VALUE 0 @@ -1229,7 +1238,7 @@ VARIABLE_COMMENT Allocation block size for storing ranges during optimization NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 4294967295 -@@ -2984,7 +2984,7 @@ +@@ -3004,7 +3004,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME READ_BUFFER_SIZE VARIABLE_SCOPE SESSION @@ -1238,7 +1247,7 @@ VARIABLE_COMMENT Each thread that does a sequential scan allocates a buffer of this size for each table it scans. If you do many sequential scans, you may want to increase this value NUMERIC_MIN_VALUE 8192 NUMERIC_MAX_VALUE 2147483647 -@@ -3004,7 +3004,7 @@ +@@ -3024,7 +3024,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME READ_RND_BUFFER_SIZE VARIABLE_SCOPE SESSION @@ -1247,7 +1256,7 @@ VARIABLE_COMMENT When reading rows in sorted order after a sort, the rows are read through this buffer to avoid a disk seeks NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 2147483647 -@@ -3024,10 +3024,10 @@ +@@ -3044,10 +3044,10 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME ROWID_MERGE_BUFF_SIZE VARIABLE_SCOPE SESSION @@ -1260,7 +1269,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3064,7 +3064,7 @@ +@@ -3084,7 +3084,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SERVER_ID VARIABLE_SCOPE SESSION @@ -1269,7 +1278,7 @@ VARIABLE_COMMENT Uniquely identifies the server instance in the community of replication partners NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -3134,7 +3134,7 @@ +@@ -3164,7 +3164,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME SLAVE_MAX_ALLOWED_PACKET VARIABLE_SCOPE GLOBAL @@ -1278,7 +1287,7 @@ VARIABLE_COMMENT The maximum packet length to sent successfully from the master to slave. NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -3144,7 +3144,7 @@ +@@ -3174,7 +3174,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLOW_LAUNCH_TIME VARIABLE_SCOPE GLOBAL @@ -1287,7 +1296,7 @@ VARIABLE_COMMENT If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be incremented NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -3187,7 +3187,7 @@ +@@ -3217,7 +3217,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Each thread that needs to do a sort allocates a buffer of this size NUMERIC_MIN_VALUE 1024 @@ -1296,7 +1305,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3404,7 +3404,7 @@ +@@ -3434,7 +3434,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME STORED_PROGRAM_CACHE VARIABLE_SCOPE GLOBAL @@ -1305,7 +1314,7 @@ VARIABLE_COMMENT The soft upper limit for number of cached stored routines for one connection. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 524288 -@@ -3484,7 +3484,7 @@ +@@ -3514,7 +3514,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME TABLE_DEFINITION_CACHE VARIABLE_SCOPE GLOBAL @@ -1314,7 +1323,7 @@ VARIABLE_COMMENT The number of cached table definitions NUMERIC_MIN_VALUE 400 NUMERIC_MAX_VALUE 2097152 -@@ -3494,7 +3494,7 @@ +@@ -3524,7 +3524,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TABLE_OPEN_CACHE VARIABLE_SCOPE GLOBAL @@ -1323,7 +1332,7 @@ VARIABLE_COMMENT The number of cached open tables NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 1048576 -@@ -3554,7 +3554,7 @@ +@@ -3584,7 +3584,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME THREAD_CACHE_SIZE VARIABLE_SCOPE GLOBAL @@ -1332,7 +1341,7 @@ VARIABLE_COMMENT How many threads we should keep in a cache for reuse. These are freed after 5 minutes of idle time NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -3637,7 +3637,7 @@ +@@ -3667,7 +3667,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Max size for data for an internal temporary on-disk MyISAM or Aria table. NUMERIC_MIN_VALUE 1024 @@ -1341,7 +1350,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3647,7 +3647,7 @@ +@@ -3677,7 +3677,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. Same as tmp_table_size. NUMERIC_MIN_VALUE 0 @@ -1350,7 +1359,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3657,14 +3657,14 @@ +@@ -3687,14 +3687,14 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Alias for tmp_memory_table_size. If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. NUMERIC_MIN_VALUE 0 @@ -1367,7 +1376,7 @@ VARIABLE_COMMENT Allocation block size for transactions to be stored in binary log NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 134217728 -@@ -3674,7 +3674,7 @@ +@@ -3704,7 +3704,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TRANSACTION_PREALLOC_SIZE VARIABLE_SCOPE SESSION @@ -1376,7 +1385,7 @@ VARIABLE_COMMENT Persistent buffer for transactions to be stored in binary log NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 134217728 -@@ -3814,7 +3814,7 @@ +@@ -3844,7 +3844,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME WAIT_TIMEOUT VARIABLE_SCOPE SESSION @@ -1385,7 +1394,7 @@ VARIABLE_COMMENT The number of seconds the server waits for activity on a connection before closing it NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -3841,7 +3841,7 @@ +@@ -3871,7 +3871,7 @@ VARIABLE_NAME LOG_TC_SIZE GLOBAL_VALUE_ORIGIN AUTO VARIABLE_SCOPE GLOBAL diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result index 4d0f34bf451..6d0d147a9db 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result @@ -12,6 +12,16 @@ variable_name not in ( 'log_tc_size','have_sanitizer' ) order by variable_name; +VARIABLE_NAME ALLOW_SUSPICIOUS_UDFS +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE BOOLEAN +VARIABLE_COMMENT Allows use of user-defined functions (UDFs) consisting of only one symbol xxx() without corresponding xxx_init() or xxx_deinit(). That also means that one can load any function from any library, for example exit() from libc.so +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST OFF,ON +READ_ONLY YES +COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME ALTER_ALGORITHM VARIABLE_SCOPE SESSION VARIABLE_TYPE ENUM @@ -2242,6 +2252,16 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_EXTRA_PRUNING_DEPTH +VARIABLE_SCOPE SESSION +VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_COMMENT If the optimizer needs to enumerate join prefix of this size or larger, then it will try agressively prune away the search space. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 62 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_MAX_SEL_ARG_WEIGHT VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED @@ -2255,9 +2275,9 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_PRUNE_LEVEL VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Controls the heuristic(s) applied during query optimization to prune less-promising partial plans from the optimizer search space. Meaning: 0 - do not apply any heuristic, thus perform exhaustive search; 1 - prune plans based on number of retrieved rows +VARIABLE_COMMENT Controls the heuristic(s) applied during query optimization to prune less-promising partial plans from the optimizer search space. Meaning: 0 - do not apply any heuristic, thus perform exhaustive search: 1 - prune plans based on cost and number of retrieved rows eq_ref: 2 - prune also if we find an eq_ref chain NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 1 +NUMERIC_MAX_VALUE 2 NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO @@ -3082,6 +3102,16 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON READ_ONLY YES COMMAND_LINE_ARGUMENT NULL +VARIABLE_NAME SKIP_GRANT_TABLES +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE BOOLEAN +VARIABLE_COMMENT Start without grant tables. This gives all users FULL ACCESS to all tables. +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST OFF,ON +READ_ONLY YES +COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME SKIP_NAME_RESOLVE VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff index d4852f1aef9..8ba94d3ba77 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff @@ -1,6 +1,4 @@ ---- ../../mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result 2021-05-12 15:30:19.783373551 +0530 -+++ ../../mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.reject 2021-05-12 15:32:40.170343130 +0530 -@@ -34,7 +34,7 @@ +@@ -44,7 +44,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_BLOCK_SIZE VARIABLE_SCOPE GLOBAL @@ -9,7 +7,7 @@ VARIABLE_COMMENT Block size to be used for Aria index pages. NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 32768 -@@ -44,7 +44,7 @@ +@@ -54,7 +54,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_CHECKPOINT_INTERVAL VARIABLE_SCOPE GLOBAL @@ -18,7 +16,7 @@ VARIABLE_COMMENT Interval between tries to do an automatic checkpoints. In seconds; 0 means 'no automatic checkpoints' which makes sense only for testing. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -54,7 +54,7 @@ +@@ -64,7 +64,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_CHECKPOINT_LOG_ACTIVITY VARIABLE_SCOPE GLOBAL @@ -27,7 +25,7 @@ VARIABLE_COMMENT Number of bytes that the transaction log has to grow between checkpoints before a new checkpoint is written to the log. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -74,7 +74,7 @@ +@@ -84,7 +84,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME ARIA_FORCE_START_AFTER_RECOVERY_FAILURES VARIABLE_SCOPE GLOBAL @@ -36,7 +34,7 @@ VARIABLE_COMMENT Number of consecutive log recovery failures after which logs will be automatically deleted to cure the problem; 0 (the default) disables the feature. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 -@@ -94,7 +94,7 @@ +@@ -104,7 +104,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_GROUP_COMMIT_INTERVAL VARIABLE_SCOPE GLOBAL @@ -45,7 +43,7 @@ VARIABLE_COMMENT Interval between commits in microseconds (1/1000000 sec). 0 stands for no waiting for other threads to come and do a commit in "hard" mode and no sync()/commit at all in "soft" mode. Option has only an effect if aria_group_commit is used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -104,7 +104,7 @@ +@@ -114,7 +114,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_LOG_FILE_SIZE VARIABLE_SCOPE GLOBAL @@ -54,7 +52,7 @@ VARIABLE_COMMENT Limit for transaction log size NUMERIC_MIN_VALUE 8388608 NUMERIC_MAX_VALUE 4294967295 -@@ -134,10 +134,10 @@ +@@ -144,10 +144,10 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_PAGECACHE_AGE_THRESHOLD VARIABLE_SCOPE GLOBAL @@ -67,7 +65,7 @@ NUMERIC_BLOCK_SIZE 100 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -154,7 +154,7 @@ +@@ -164,7 +164,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_PAGECACHE_DIVISION_LIMIT VARIABLE_SCOPE GLOBAL @@ -76,7 +74,7 @@ VARIABLE_COMMENT The minimum percentage of warm blocks in key cache NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 100 -@@ -164,7 +164,7 @@ +@@ -174,7 +174,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_PAGECACHE_FILE_HASH_SIZE VARIABLE_SCOPE GLOBAL @@ -85,7 +83,7 @@ VARIABLE_COMMENT Number of hash buckets for open and changed files. If you have a lot of Aria files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open Aria files. NUMERIC_MIN_VALUE 128 NUMERIC_MAX_VALUE 16384 -@@ -194,7 +194,7 @@ +@@ -204,7 +204,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME ARIA_REPAIR_THREADS VARIABLE_SCOPE SESSION @@ -94,7 +92,7 @@ VARIABLE_COMMENT Number of threads to use when repairing Aria tables. The value of 1 disables parallel repair. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 128 -@@ -207,7 +207,7 @@ +@@ -217,7 +217,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE. NUMERIC_MIN_VALUE 4096 @@ -103,7 +101,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -264,7 +264,7 @@ +@@ -274,7 +274,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME AUTO_INCREMENT_INCREMENT VARIABLE_SCOPE SESSION @@ -112,7 +110,7 @@ VARIABLE_COMMENT Auto-increment columns are incremented by this NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 65535 -@@ -274,7 +274,7 @@ +@@ -284,7 +284,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME AUTO_INCREMENT_OFFSET VARIABLE_SCOPE SESSION @@ -121,7 +119,7 @@ VARIABLE_COMMENT Offset added to Auto-increment columns. Used when auto-increment-increment != 1 NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 65535 -@@ -284,7 +284,7 @@ +@@ -294,7 +294,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME BACK_LOG VARIABLE_SCOPE GLOBAL @@ -130,7 +128,7 @@ VARIABLE_COMMENT The number of outstanding connection requests MariaDB can have. This comes into play when the main MariaDB thread gets very many connection requests in a very short time NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65535 -@@ -337,7 +337,7 @@ +@@ -357,7 +357,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the transactional cache for updates to transactional engines for the binary log. If you often use transactions containing many statements, you can increase this to get more performance NUMERIC_MIN_VALUE 4096 @@ -139,7 +137,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -354,20 +354,20 @@ +@@ -374,20 +374,20 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BINLOG_COMMIT_WAIT_COUNT VARIABLE_SCOPE GLOBAL @@ -164,7 +162,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -384,7 +384,7 @@ +@@ -404,7 +404,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME BINLOG_EXPIRE_LOGS_SECONDS VARIABLE_SCOPE GLOBAL @@ -173,7 +171,7 @@ VARIABLE_COMMENT If non-zero, binary logs will be purged after binlog_expire_logs_seconds seconds; It and expire_logs_days are linked, such that changes in one are converted into the other. Possible purges happen at startup and at binary log rotation. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 8553600 -@@ -397,7 +397,7 @@ +@@ -417,7 +417,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of file cache for the binary log NUMERIC_MIN_VALUE 8192 @@ -182,7 +180,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -447,7 +447,7 @@ +@@ -467,7 +467,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the statement cache for updates to non-transactional engines for the binary log. If you often use statements updating a great number of rows, you can increase this to get more performance. NUMERIC_MIN_VALUE 4096 @@ -191,7 +189,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -457,7 +457,7 @@ +@@ -477,7 +477,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Size of tree cache used in bulk insert optimisation. Note that this is a limit per thread! NUMERIC_MIN_VALUE 0 @@ -200,7 +198,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -644,7 +644,7 @@ +@@ -664,7 +664,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME CONNECT_TIMEOUT VARIABLE_SCOPE GLOBAL @@ -209,7 +207,7 @@ VARIABLE_COMMENT The number of seconds the mysqld server is waiting for a connect packet before responding with 'Bad handshake' NUMERIC_MIN_VALUE 2 NUMERIC_MAX_VALUE 31536000 -@@ -694,7 +694,7 @@ +@@ -714,7 +714,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_SEARCH_DEPTH_LONG VARIABLE_SCOPE SESSION @@ -218,7 +216,7 @@ VARIABLE_COMMENT Long search depth for the two-step deadlock detection NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 33 -@@ -704,7 +704,7 @@ +@@ -724,7 +724,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_SEARCH_DEPTH_SHORT VARIABLE_SCOPE SESSION @@ -227,7 +225,7 @@ VARIABLE_COMMENT Short search depth for the two-step deadlock detection NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 32 -@@ -714,7 +714,7 @@ +@@ -734,7 +734,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_TIMEOUT_LONG VARIABLE_SCOPE SESSION @@ -236,7 +234,7 @@ VARIABLE_COMMENT Long timeout for the two-step deadlock detection (in microseconds) NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -724,7 +724,7 @@ +@@ -744,7 +744,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_TIMEOUT_SHORT VARIABLE_SCOPE SESSION @@ -245,7 +243,7 @@ VARIABLE_COMMENT Short timeout for the two-step deadlock detection (in microseconds) NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -784,7 +784,7 @@ +@@ -804,7 +804,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME DEFAULT_WEEK_FORMAT VARIABLE_SCOPE SESSION @@ -254,7 +252,7 @@ VARIABLE_COMMENT The default week format used by WEEK() functions NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 7 -@@ -794,7 +794,7 @@ +@@ -814,7 +814,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DELAYED_INSERT_LIMIT VARIABLE_SCOPE GLOBAL @@ -263,7 +261,7 @@ VARIABLE_COMMENT After inserting delayed_insert_limit rows, the INSERT DELAYED handler will check if there are any SELECT statements pending. If so, it allows these to execute before continuing. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -804,7 +804,7 @@ +@@ -824,7 +824,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DELAYED_INSERT_TIMEOUT VARIABLE_SCOPE GLOBAL @@ -272,7 +270,7 @@ VARIABLE_COMMENT How long a INSERT DELAYED thread should wait for INSERT statements before terminating NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -814,7 +814,7 @@ +@@ -834,7 +834,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DELAYED_QUEUE_SIZE VARIABLE_SCOPE GLOBAL @@ -281,7 +279,7 @@ VARIABLE_COMMENT What size queue (in rows) should be allocated for handling INSERT DELAYED. If the queue becomes full, any client that does INSERT DELAYED will wait until there is room in the queue again NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -844,7 +844,7 @@ +@@ -864,7 +864,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME DIV_PRECISION_INCREMENT VARIABLE_SCOPE SESSION @@ -290,7 +288,7 @@ VARIABLE_COMMENT Precision of the result of '/' operator will be increased on that value NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 38 -@@ -964,7 +964,7 @@ +@@ -984,7 +984,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME EXTRA_MAX_CONNECTIONS VARIABLE_SCOPE GLOBAL @@ -299,7 +297,7 @@ VARIABLE_COMMENT The number of connections on extra-port NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 100000 -@@ -994,7 +994,7 @@ +@@ -1014,7 +1014,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME FLUSH_TIME VARIABLE_SCOPE GLOBAL @@ -308,7 +306,7 @@ VARIABLE_COMMENT A dedicated thread is created to flush all tables at the given interval NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -1024,7 +1024,7 @@ +@@ -1044,7 +1044,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME FT_MAX_WORD_LEN VARIABLE_SCOPE GLOBAL @@ -317,7 +315,7 @@ VARIABLE_COMMENT The maximum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 84 -@@ -1034,7 +1034,7 @@ +@@ -1054,7 +1054,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME FT_MIN_WORD_LEN VARIABLE_SCOPE GLOBAL @@ -326,7 +324,7 @@ VARIABLE_COMMENT The minimum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 84 -@@ -1044,7 +1044,7 @@ +@@ -1064,7 +1064,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME FT_QUERY_EXPANSION_LIMIT VARIABLE_SCOPE GLOBAL @@ -335,7 +333,7 @@ VARIABLE_COMMENT Number of best matches to use for query expansion NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1000 -@@ -1294,7 +1294,7 @@ +@@ -1314,7 +1314,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME HISTOGRAM_SIZE VARIABLE_SCOPE SESSION @@ -344,7 +342,7 @@ VARIABLE_COMMENT Number of bytes used for a histogram. If set to 0, no histograms are created by ANALYZE. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 -@@ -1324,7 +1324,7 @@ +@@ -1344,7 +1344,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME HOST_CACHE_SIZE VARIABLE_SCOPE GLOBAL @@ -353,7 +351,7 @@ VARIABLE_COMMENT How many host names should be cached to avoid resolving. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65536 -@@ -1434,7 +1434,7 @@ +@@ -1454,7 +1454,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME INTERACTIVE_TIMEOUT VARIABLE_SCOPE SESSION @@ -362,7 +360,7 @@ VARIABLE_COMMENT The number of seconds the server waits for activity on an interactive connection before closing it NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -1467,7 +1467,7 @@ +@@ -1487,7 +1487,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the buffer that is used for joins NUMERIC_MIN_VALUE 128 @@ -371,7 +369,7 @@ NUMERIC_BLOCK_SIZE 128 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1484,7 +1484,7 @@ +@@ -1504,7 +1504,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME JOIN_CACHE_LEVEL VARIABLE_SCOPE SESSION @@ -380,7 +378,7 @@ VARIABLE_COMMENT Controls what join operations can be executed with join buffers. Odd numbers are used for plain join buffers while even numbers are used for linked buffers NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 8 -@@ -1507,7 +1507,7 @@ +@@ -1527,7 +1527,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the buffer used for index blocks for MyISAM tables. Increase this to get better index handling (for all reads and multiple writes) to as much as you can afford NUMERIC_MIN_VALUE 0 @@ -389,7 +387,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1674,7 +1674,7 @@ +@@ -1694,7 +1694,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME LOCK_WAIT_TIMEOUT VARIABLE_SCOPE SESSION @@ -398,7 +396,7 @@ VARIABLE_COMMENT Timeout in seconds to wait for a lock before returning an error. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -1824,7 +1824,7 @@ +@@ -1844,7 +1844,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_SLOW_RATE_LIMIT VARIABLE_SCOPE SESSION @@ -407,7 +405,7 @@ VARIABLE_COMMENT Write to slow log every #th slow query. Set to 1 to log everything. Increase it to reduce the size of the slow or the performance impact of slow logging NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -1854,7 +1854,7 @@ +@@ -1874,7 +1874,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_WARNINGS VARIABLE_SCOPE SESSION @@ -416,7 +414,7 @@ VARIABLE_COMMENT Log some not critical warnings to the general log file.Value can be between 0 and 11. Higher values mean more verbosity NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -1914,7 +1914,7 @@ +@@ -1934,7 +1934,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME MAX_ALLOWED_PACKET VARIABLE_SCOPE SESSION @@ -425,7 +423,7 @@ VARIABLE_COMMENT Max packet length to send to or receive from the server NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -1927,14 +1927,14 @@ +@@ -1947,14 +1947,14 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the total size of the transactional cache NUMERIC_MIN_VALUE 4096 @@ -442,7 +440,7 @@ VARIABLE_COMMENT Binary log will be rotated automatically when the size exceeds this value. NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 1073741824 -@@ -1947,14 +1947,14 @@ +@@ -1967,14 +1967,14 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the total size of the statement cache NUMERIC_MIN_VALUE 4096 @@ -459,7 +457,7 @@ VARIABLE_COMMENT The number of simultaneous clients allowed NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 100000 -@@ -1964,7 +1964,7 @@ +@@ -1984,7 +1984,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_CONNECT_ERRORS VARIABLE_SCOPE GLOBAL @@ -468,7 +466,7 @@ VARIABLE_COMMENT If there is more than this number of interrupted connections from a host this host will be blocked from further connections NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -1974,7 +1974,7 @@ +@@ -1994,7 +1994,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_DELAYED_THREADS VARIABLE_SCOPE SESSION @@ -477,7 +475,7 @@ VARIABLE_COMMENT Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -1994,7 +1994,7 @@ +@@ -2014,7 +2014,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_ERROR_COUNT VARIABLE_SCOPE SESSION @@ -486,7 +484,7 @@ VARIABLE_COMMENT Max number of errors/warnings to store for a statement NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65535 -@@ -2007,14 +2007,14 @@ +@@ -2027,14 +2027,14 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Don't allow creation of heap tables bigger than this NUMERIC_MIN_VALUE 16384 @@ -503,7 +501,7 @@ VARIABLE_COMMENT Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -2034,7 +2034,7 @@ +@@ -2054,7 +2054,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_LENGTH_FOR_SORT_DATA VARIABLE_SCOPE SESSION @@ -512,7 +510,7 @@ VARIABLE_COMMENT Max number of bytes in sorted records NUMERIC_MIN_VALUE 4 NUMERIC_MAX_VALUE 8388608 -@@ -2064,7 +2064,7 @@ +@@ -2084,7 +2084,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_RECURSIVE_ITERATIONS VARIABLE_SCOPE SESSION @@ -521,7 +519,7 @@ VARIABLE_COMMENT Maximum number of iterations when executing recursive queries NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2087,14 +2087,14 @@ +@@ -2107,14 +2107,14 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The maximum size of the container of a rowid filter NUMERIC_MIN_VALUE 1024 @@ -538,7 +536,7 @@ VARIABLE_COMMENT Limit assumed max number of seeks when looking up rows based on a key NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2114,7 +2114,7 @@ +@@ -2134,7 +2134,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_SORT_LENGTH VARIABLE_SCOPE SESSION @@ -547,7 +545,7 @@ VARIABLE_COMMENT The number of bytes to use when sorting BLOB or TEXT values (only the first max_sort_length bytes of each value are used; the rest are ignored) NUMERIC_MIN_VALUE 64 NUMERIC_MAX_VALUE 8388608 -@@ -2124,7 +2124,7 @@ +@@ -2144,7 +2144,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_SP_RECURSION_DEPTH VARIABLE_SCOPE SESSION @@ -556,7 +554,7 @@ VARIABLE_COMMENT Maximum stored procedure recursion depth NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 -@@ -2144,7 +2144,7 @@ +@@ -2164,7 +2164,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_TMP_TABLES VARIABLE_SCOPE SESSION @@ -565,7 +563,7 @@ VARIABLE_COMMENT Unused, will be removed. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2164,7 +2164,7 @@ +@@ -2184,7 +2184,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_WRITE_LOCK_COUNT VARIABLE_SCOPE GLOBAL @@ -574,7 +572,7 @@ VARIABLE_COMMENT After this many write locks, allow some read locks to run in between NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2174,7 +2174,7 @@ +@@ -2194,7 +2194,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME METADATA_LOCKS_CACHE_SIZE VARIABLE_SCOPE GLOBAL @@ -583,7 +581,7 @@ VARIABLE_COMMENT Unused NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1048576 -@@ -2184,7 +2184,7 @@ +@@ -2204,7 +2204,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME METADATA_LOCKS_HASH_INSTANCES VARIABLE_SCOPE GLOBAL @@ -592,7 +590,7 @@ VARIABLE_COMMENT Unused NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1024 -@@ -2194,7 +2194,7 @@ +@@ -2214,7 +2214,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MIN_EXAMINED_ROW_LIMIT VARIABLE_SCOPE SESSION @@ -601,7 +599,7 @@ VARIABLE_COMMENT Don't write queries to slow log that examine fewer rows than that NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2204,7 +2204,7 @@ +@@ -2224,7 +2224,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MRR_BUFFER_SIZE VARIABLE_SCOPE SESSION @@ -610,7 +608,7 @@ VARIABLE_COMMENT Size of buffer to use when using MRR with range access NUMERIC_MIN_VALUE 8192 NUMERIC_MAX_VALUE 2147483647 -@@ -2214,7 +2214,7 @@ +@@ -2234,7 +2234,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MYISAM_BLOCK_SIZE VARIABLE_SCOPE GLOBAL @@ -619,7 +617,7 @@ VARIABLE_COMMENT Block size to be used for MyISAM index pages NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 16384 -@@ -2224,7 +2224,7 @@ +@@ -2244,7 +2244,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MYISAM_DATA_POINTER_SIZE VARIABLE_SCOPE GLOBAL @@ -628,7 +626,7 @@ VARIABLE_COMMENT Default pointer size to be used for MyISAM tables NUMERIC_MIN_VALUE 2 NUMERIC_MAX_VALUE 7 -@@ -2247,7 +2247,7 @@ +@@ -2267,7 +2267,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Restricts the total memory used for memory mapping of MySQL tables NUMERIC_MIN_VALUE 7 @@ -637,7 +635,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY YES -@@ -2264,10 +2264,10 @@ +@@ -2284,10 +2284,10 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME MYISAM_REPAIR_THREADS VARIABLE_SCOPE SESSION @@ -650,7 +648,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2277,7 +2277,7 @@ +@@ -2297,7 +2297,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE NUMERIC_MIN_VALUE 4096 @@ -659,7 +657,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2314,7 +2314,7 @@ +@@ -2334,7 +2334,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME NET_BUFFER_LENGTH VARIABLE_SCOPE SESSION @@ -668,7 +666,7 @@ VARIABLE_COMMENT Buffer length for TCP/IP and socket communication NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1048576 -@@ -2324,7 +2324,7 @@ +@@ -2344,7 +2344,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME NET_READ_TIMEOUT VARIABLE_SCOPE SESSION @@ -677,7 +675,7 @@ VARIABLE_COMMENT Number of seconds to wait for more data from a connection before aborting the read NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -2334,7 +2334,7 @@ +@@ -2354,7 +2354,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME NET_RETRY_COUNT VARIABLE_SCOPE SESSION @@ -686,7 +684,7 @@ VARIABLE_COMMENT If a read on a communication port is interrupted, retry this many times before giving up NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2344,7 +2344,7 @@ +@@ -2364,7 +2364,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME NET_WRITE_TIMEOUT VARIABLE_SCOPE SESSION @@ -695,7 +693,7 @@ VARIABLE_COMMENT Number of seconds to wait for a block to be written to a connection before aborting the write NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -2394,7 +2394,7 @@ +@@ -2414,7 +2414,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME OPEN_FILES_LIMIT VARIABLE_SCOPE GLOBAL @@ -704,7 +702,16 @@ VARIABLE_COMMENT If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 or autoset then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2404,17 +2404,17 @@ +@@ -2424,7 +2424,7 @@ + COMMAND_LINE_ARGUMENT REQUIRED + VARIABLE_NAME OPTIMIZER_EXTRA_PRUNING_DEPTH + VARIABLE_SCOPE SESSION +-VARIABLE_TYPE BIGINT UNSIGNED ++VARIABLE_TYPE INT UNSIGNED + VARIABLE_COMMENT If the optimizer needs to enumerate join prefix of this size or larger, then it will try agressively prune away the search space. + NUMERIC_MIN_VALUE 0 + NUMERIC_MAX_VALUE 62 +@@ -2434,17 +2434,17 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_MAX_SEL_ARG_WEIGHT VARIABLE_SCOPE SESSION @@ -722,10 +729,10 @@ VARIABLE_SCOPE SESSION -VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Controls the heuristic(s) applied during query optimization to prune less-promising partial plans from the optimizer search space. Meaning: 0 - do not apply any heuristic, thus perform exhaustive search; 1 - prune plans based on number of retrieved rows + VARIABLE_COMMENT Controls the heuristic(s) applied during query optimization to prune less-promising partial plans from the optimizer search space. Meaning: 0 - do not apply any heuristic, thus perform exhaustive search: 1 - prune plans based on cost and number of retrieved rows eq_ref: 2 - prune also if we find an eq_ref chain NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 1 -@@ -2424,7 +2424,7 @@ + NUMERIC_MAX_VALUE 2 +@@ -2454,7 +2454,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_SEARCH_DEPTH VARIABLE_SCOPE SESSION @@ -734,7 +741,7 @@ VARIABLE_COMMENT Maximum depth of search performed by the query optimizer. Values larger than the number of relations in a query result in better query plans, but take longer to compile a query. Values smaller than the number of tables in a relation result in faster optimization, but may produce very bad query plans. If set to 0, the system will automatically pick a reasonable value. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 62 -@@ -2434,7 +2434,7 @@ +@@ -2464,7 +2464,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_SELECTIVITY_SAMPLING_LIMIT VARIABLE_SCOPE SESSION @@ -743,7 +750,7 @@ VARIABLE_COMMENT Controls number of record samples to check condition selectivity NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 4294967295 -@@ -2464,17 +2464,17 @@ +@@ -2494,17 +2494,17 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_TRACE_MAX_MEM_SIZE VARIABLE_SCOPE SESSION @@ -764,7 +771,7 @@ VARIABLE_COMMENT Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join.5 - additionally use selectivity of certain non-range predicates calculated on record samples NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 5 -@@ -2494,7 +2494,7 @@ +@@ -2524,7 +2524,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME PERFORMANCE_SCHEMA_ACCOUNTS_SIZE VARIABLE_SCOPE GLOBAL @@ -773,7 +780,7 @@ VARIABLE_COMMENT Maximum number of instrumented user@host accounts. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2504,7 +2504,7 @@ +@@ -2534,7 +2534,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_DIGESTS_SIZE VARIABLE_SCOPE GLOBAL @@ -782,7 +789,7 @@ VARIABLE_COMMENT Size of the statement digest. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2514,7 +2514,7 @@ +@@ -2544,7 +2544,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STAGES_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -791,7 +798,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_STAGES_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2524,7 +2524,7 @@ +@@ -2554,7 +2554,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STAGES_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -800,7 +807,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_STAGES_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2534,7 +2534,7 @@ +@@ -2564,7 +2564,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STATEMENTS_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -809,7 +816,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_STATEMENTS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2544,7 +2544,7 @@ +@@ -2574,7 +2574,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STATEMENTS_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -818,7 +825,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_STATEMENTS_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2554,7 +2554,7 @@ +@@ -2584,7 +2584,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_TRANSACTIONS_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -827,7 +834,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_TRANSACTIONS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2564,7 +2564,7 @@ +@@ -2594,7 +2594,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_TRANSACTIONS_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -836,7 +843,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_TRANSACTIONS_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2574,7 +2574,7 @@ +@@ -2604,7 +2604,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -845,7 +852,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2584,7 +2584,7 @@ +@@ -2614,7 +2614,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -854,7 +861,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_WAITS_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2594,7 +2594,7 @@ +@@ -2624,7 +2624,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_HOSTS_SIZE VARIABLE_SCOPE GLOBAL @@ -863,7 +870,7 @@ VARIABLE_COMMENT Maximum number of instrumented hosts. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2604,7 +2604,7 @@ +@@ -2634,7 +2634,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_COND_CLASSES VARIABLE_SCOPE GLOBAL @@ -872,7 +879,7 @@ VARIABLE_COMMENT Maximum number of condition instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2614,7 +2614,7 @@ +@@ -2644,7 +2644,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_COND_INSTANCES VARIABLE_SCOPE GLOBAL @@ -881,7 +888,7 @@ VARIABLE_COMMENT Maximum number of instrumented condition objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2624,7 +2624,7 @@ +@@ -2654,7 +2654,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_DIGEST_LENGTH VARIABLE_SCOPE GLOBAL @@ -890,7 +897,7 @@ VARIABLE_COMMENT Maximum length considered for digest text, when stored in performance_schema tables. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2634,7 +2634,7 @@ +@@ -2664,7 +2664,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_FILE_CLASSES VARIABLE_SCOPE GLOBAL @@ -899,7 +906,7 @@ VARIABLE_COMMENT Maximum number of file instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2644,7 +2644,7 @@ +@@ -2674,7 +2674,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_FILE_HANDLES VARIABLE_SCOPE GLOBAL @@ -908,7 +915,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented files. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2654,7 +2654,7 @@ +@@ -2684,7 +2684,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_FILE_INSTANCES VARIABLE_SCOPE GLOBAL @@ -917,7 +924,7 @@ VARIABLE_COMMENT Maximum number of instrumented files. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2664,7 +2664,7 @@ +@@ -2694,7 +2694,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_INDEX_STAT VARIABLE_SCOPE GLOBAL @@ -926,7 +933,7 @@ VARIABLE_COMMENT Maximum number of index statistics for instrumented tables. Use 0 to disable, -1 for automated scaling. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2674,7 +2674,7 @@ +@@ -2704,7 +2704,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_MEMORY_CLASSES VARIABLE_SCOPE GLOBAL @@ -935,7 +942,7 @@ VARIABLE_COMMENT Maximum number of memory pool instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1024 -@@ -2684,7 +2684,7 @@ +@@ -2714,7 +2714,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_METADATA_LOCKS VARIABLE_SCOPE GLOBAL @@ -944,7 +951,7 @@ VARIABLE_COMMENT Maximum number of metadata locks. Use 0 to disable, -1 for automated scaling. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 104857600 -@@ -2694,7 +2694,7 @@ +@@ -2724,7 +2724,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_MUTEX_CLASSES VARIABLE_SCOPE GLOBAL @@ -953,7 +960,7 @@ VARIABLE_COMMENT Maximum number of mutex instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2704,7 +2704,7 @@ +@@ -2734,7 +2734,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_MUTEX_INSTANCES VARIABLE_SCOPE GLOBAL @@ -962,7 +969,7 @@ VARIABLE_COMMENT Maximum number of instrumented MUTEX objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 104857600 -@@ -2714,7 +2714,7 @@ +@@ -2744,7 +2744,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_PREPARED_STATEMENTS_INSTANCES VARIABLE_SCOPE GLOBAL @@ -971,7 +978,7 @@ VARIABLE_COMMENT Maximum number of instrumented prepared statements. Use 0 to disable, -1 for automated scaling. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2724,7 +2724,7 @@ +@@ -2754,7 +2754,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_PROGRAM_INSTANCES VARIABLE_SCOPE GLOBAL @@ -980,7 +987,7 @@ VARIABLE_COMMENT Maximum number of instrumented programs. Use 0 to disable, -1 for automated scaling. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2734,7 +2734,7 @@ +@@ -2764,7 +2764,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_RWLOCK_CLASSES VARIABLE_SCOPE GLOBAL @@ -989,7 +996,7 @@ VARIABLE_COMMENT Maximum number of rwlock instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2744,7 +2744,7 @@ +@@ -2774,7 +2774,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_RWLOCK_INSTANCES VARIABLE_SCOPE GLOBAL @@ -998,7 +1005,7 @@ VARIABLE_COMMENT Maximum number of instrumented RWLOCK objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 104857600 -@@ -2754,7 +2754,7 @@ +@@ -2784,7 +2784,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_SOCKET_CLASSES VARIABLE_SCOPE GLOBAL @@ -1007,7 +1014,7 @@ VARIABLE_COMMENT Maximum number of socket instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2764,7 +2764,7 @@ +@@ -2794,7 +2794,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_SOCKET_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1016,7 +1023,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented sockets. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2774,7 +2774,7 @@ +@@ -2804,7 +2804,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_SQL_TEXT_LENGTH VARIABLE_SCOPE GLOBAL @@ -1025,7 +1032,7 @@ VARIABLE_COMMENT Maximum length of displayed sql text. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2784,7 +2784,7 @@ +@@ -2814,7 +2814,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_STAGE_CLASSES VARIABLE_SCOPE GLOBAL @@ -1034,7 +1041,7 @@ VARIABLE_COMMENT Maximum number of stage instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2794,7 +2794,7 @@ +@@ -2824,7 +2824,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_STATEMENT_CLASSES VARIABLE_SCOPE GLOBAL @@ -1043,7 +1050,7 @@ VARIABLE_COMMENT Maximum number of statement instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2804,7 +2804,7 @@ +@@ -2834,7 +2834,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_STATEMENT_STACK VARIABLE_SCOPE GLOBAL @@ -1052,7 +1059,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_STATEMENTS_CURRENT. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 256 -@@ -2814,7 +2814,7 @@ +@@ -2844,7 +2844,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_TABLE_HANDLES VARIABLE_SCOPE GLOBAL @@ -1061,7 +1068,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented tables. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2824,7 +2824,7 @@ +@@ -2854,7 +2854,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_TABLE_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1070,7 +1077,7 @@ VARIABLE_COMMENT Maximum number of instrumented tables. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2834,7 +2834,7 @@ +@@ -2864,7 +2864,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_TABLE_LOCK_STAT VARIABLE_SCOPE GLOBAL @@ -1079,7 +1086,7 @@ VARIABLE_COMMENT Maximum number of lock statistics for instrumented tables. Use 0 to disable, -1 for automated scaling. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2844,7 +2844,7 @@ +@@ -2874,7 +2874,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_THREAD_CLASSES VARIABLE_SCOPE GLOBAL @@ -1088,7 +1095,7 @@ VARIABLE_COMMENT Maximum number of thread instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2854,7 +2854,7 @@ +@@ -2884,7 +2884,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_THREAD_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1097,7 +1104,7 @@ VARIABLE_COMMENT Maximum number of instrumented threads. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2864,7 +2864,7 @@ +@@ -2894,7 +2894,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_SESSION_CONNECT_ATTRS_SIZE VARIABLE_SCOPE GLOBAL @@ -1106,7 +1113,7 @@ VARIABLE_COMMENT Size of session attribute string buffer per thread. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2874,7 +2874,7 @@ +@@ -2904,7 +2904,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_SETUP_ACTORS_SIZE VARIABLE_SCOPE GLOBAL @@ -1115,7 +1122,7 @@ VARIABLE_COMMENT Maximum number of rows in SETUP_ACTORS. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2884,7 +2884,7 @@ +@@ -2914,7 +2914,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_SETUP_OBJECTS_SIZE VARIABLE_SCOPE GLOBAL @@ -1124,7 +1131,7 @@ VARIABLE_COMMENT Maximum number of rows in SETUP_OBJECTS. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2894,7 +2894,7 @@ +@@ -2924,7 +2924,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_USERS_SIZE VARIABLE_SCOPE GLOBAL @@ -1133,7 +1140,7 @@ VARIABLE_COMMENT Maximum number of instrumented users. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2944,7 +2944,7 @@ +@@ -2974,7 +2974,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PRELOAD_BUFFER_SIZE VARIABLE_SCOPE SESSION @@ -1142,7 +1149,7 @@ VARIABLE_COMMENT The size of the buffer that is allocated when preloading indexes NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -2964,7 +2964,7 @@ +@@ -2994,7 +2994,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME PROFILING_HISTORY_SIZE VARIABLE_SCOPE SESSION @@ -1151,7 +1158,7 @@ VARIABLE_COMMENT Number of statements about which profiling information is maintained. If set to 0, no profiles are stored. See SHOW PROFILES. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 100 -@@ -2974,7 +2974,7 @@ +@@ -3004,7 +3004,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PROGRESS_REPORT_TIME VARIABLE_SCOPE SESSION @@ -1160,7 +1167,7 @@ VARIABLE_COMMENT Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -3034,7 +3034,7 @@ +@@ -3064,7 +3064,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME QUERY_ALLOC_BLOCK_SIZE VARIABLE_SCOPE SESSION @@ -1169,7 +1176,7 @@ VARIABLE_COMMENT Allocation block size for query parsing and execution NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 4294967295 -@@ -3044,7 +3044,7 @@ +@@ -3074,7 +3074,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME QUERY_CACHE_LIMIT VARIABLE_SCOPE GLOBAL @@ -1178,7 +1185,7 @@ VARIABLE_COMMENT Don't cache results that are bigger than this NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -3054,7 +3054,7 @@ +@@ -3084,7 +3084,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME QUERY_CACHE_MIN_RES_UNIT VARIABLE_SCOPE GLOBAL @@ -1187,7 +1194,7 @@ VARIABLE_COMMENT The minimum size for blocks allocated by the query cache NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -3067,7 +3067,7 @@ +@@ -3097,7 +3097,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The memory allocated to store results from old queries NUMERIC_MIN_VALUE 0 @@ -1196,7 +1203,7 @@ NUMERIC_BLOCK_SIZE 1024 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3104,7 +3104,7 @@ +@@ -3134,7 +3134,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME QUERY_PREALLOC_SIZE VARIABLE_SCOPE SESSION @@ -1205,7 +1212,7 @@ VARIABLE_COMMENT Persistent buffer for query parsing and execution NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 4294967295 -@@ -3117,7 +3117,7 @@ +@@ -3147,7 +3147,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes NUMERIC_MIN_VALUE 0 @@ -1214,7 +1221,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3127,14 +3127,14 @@ +@@ -3157,14 +3157,14 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes NUMERIC_MIN_VALUE 0 @@ -1231,7 +1238,7 @@ VARIABLE_COMMENT Allocation block size for storing ranges during optimization NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 4294967295 -@@ -3147,14 +3147,14 @@ +@@ -3177,14 +3177,14 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Maximum speed(KB/s) to read binlog from master (0 = no limit) NUMERIC_MIN_VALUE 0 @@ -1248,7 +1255,7 @@ VARIABLE_COMMENT Each thread that does a sequential scan allocates a buffer of this size for each table it scans. If you do many sequential scans, you may want to increase this value NUMERIC_MIN_VALUE 8192 NUMERIC_MAX_VALUE 2147483647 -@@ -3174,7 +3174,7 @@ +@@ -3204,7 +3204,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME READ_RND_BUFFER_SIZE VARIABLE_SCOPE SESSION @@ -1257,7 +1264,7 @@ VARIABLE_COMMENT When reading rows in sorted order after a sort, the rows are read through this buffer to avoid a disk seeks NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 2147483647 -@@ -3384,10 +3384,10 @@ +@@ -3414,10 +3414,10 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME ROWID_MERGE_BUFF_SIZE VARIABLE_SCOPE SESSION @@ -1270,7 +1277,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3404,20 +3404,20 @@ +@@ -3434,20 +3434,20 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME RPL_SEMI_SYNC_MASTER_TIMEOUT VARIABLE_SCOPE GLOBAL @@ -1295,7 +1302,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3474,10 +3474,10 @@ +@@ -3504,10 +3504,10 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME RPL_SEMI_SYNC_SLAVE_TRACE_LEVEL VARIABLE_SCOPE GLOBAL @@ -1308,7 +1315,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3514,7 +3514,7 @@ +@@ -3544,7 +3544,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SERVER_ID VARIABLE_SCOPE SESSION @@ -1317,7 +1324,7 @@ VARIABLE_COMMENT Uniquely identifies the server instance in the community of replication partners NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -3644,7 +3644,7 @@ +@@ -3684,7 +3684,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_DOMAIN_PARALLEL_THREADS VARIABLE_SCOPE GLOBAL @@ -1326,7 +1333,7 @@ VARIABLE_COMMENT Maximum number of parallel threads to use on slave for events in a single replication domain. When using multiple domains, this can be used to limit a single domain from grabbing all threads and thus stalling other domains. The default of 0 means to allow a domain to grab as many threads as it wants, up to the value of slave_parallel_threads. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16383 -@@ -3674,7 +3674,7 @@ +@@ -3714,7 +3714,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_MAX_ALLOWED_PACKET VARIABLE_SCOPE GLOBAL @@ -1335,7 +1342,7 @@ VARIABLE_COMMENT The maximum packet length to sent successfully from the master to slave. NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -3694,7 +3694,7 @@ +@@ -3734,7 +3734,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_PARALLEL_MAX_QUEUED VARIABLE_SCOPE GLOBAL @@ -1344,7 +1351,7 @@ VARIABLE_COMMENT Limit on how much memory SQL threads should use per parallel replication thread when reading ahead in the relay log looking for opportunities for parallel replication. Only used when --slave-parallel-threads > 0. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 2147483647 -@@ -3714,7 +3714,7 @@ +@@ -3754,7 +3754,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME SLAVE_PARALLEL_THREADS VARIABLE_SCOPE GLOBAL @@ -1353,7 +1360,7 @@ VARIABLE_COMMENT If non-zero, number of threads to spawn to apply in parallel events on the slave that were group-committed on the master or were logged with GTID in different replication domains. Note that these threads are in addition to the IO and SQL threads, which are always created by a replication slave NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16383 -@@ -3724,7 +3724,7 @@ +@@ -3764,7 +3764,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_PARALLEL_WORKERS VARIABLE_SCOPE GLOBAL @@ -1362,7 +1369,7 @@ VARIABLE_COMMENT Alias for slave_parallel_threads NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16383 -@@ -3764,7 +3764,7 @@ +@@ -3804,7 +3804,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME SLAVE_TRANSACTION_RETRIES VARIABLE_SCOPE GLOBAL @@ -1371,7 +1378,7 @@ VARIABLE_COMMENT Number of times the slave SQL thread will retry a transaction in case it failed with a deadlock, elapsed lock wait timeout or listed in slave_transaction_retry_errors, before giving up and stopping NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -3784,7 +3784,7 @@ +@@ -3824,7 +3824,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_TRANSACTION_RETRY_INTERVAL VARIABLE_SCOPE GLOBAL @@ -1380,7 +1387,7 @@ VARIABLE_COMMENT Interval of the slave SQL thread will retry a transaction in case it failed with a deadlock or elapsed lock wait timeout or listed in slave_transaction_retry_errors NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 3600 -@@ -3804,7 +3804,7 @@ +@@ -3844,7 +3844,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLOW_LAUNCH_TIME VARIABLE_SCOPE GLOBAL @@ -1389,7 +1396,7 @@ VARIABLE_COMMENT If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be incremented NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -3847,7 +3847,7 @@ +@@ -3887,7 +3887,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Each thread that needs to do a sort allocates a buffer of this size NUMERIC_MIN_VALUE 1024 @@ -1398,7 +1405,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -4074,7 +4074,7 @@ +@@ -4114,7 +4114,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME STORED_PROGRAM_CACHE VARIABLE_SCOPE GLOBAL @@ -1407,7 +1414,7 @@ VARIABLE_COMMENT The soft upper limit for number of cached stored routines for one connection. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 524288 -@@ -4174,7 +4174,7 @@ +@@ -4214,7 +4214,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME TABLE_DEFINITION_CACHE VARIABLE_SCOPE GLOBAL @@ -1416,7 +1423,7 @@ VARIABLE_COMMENT The number of cached table definitions NUMERIC_MIN_VALUE 400 NUMERIC_MAX_VALUE 2097152 -@@ -4184,7 +4184,7 @@ +@@ -4224,7 +4224,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TABLE_OPEN_CACHE VARIABLE_SCOPE GLOBAL @@ -1425,7 +1432,7 @@ VARIABLE_COMMENT The number of cached open tables NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 1048576 -@@ -4244,7 +4244,7 @@ +@@ -4284,7 +4284,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME THREAD_CACHE_SIZE VARIABLE_SCOPE GLOBAL @@ -1434,7 +1441,7 @@ VARIABLE_COMMENT How many threads we should keep in a cache for reuse. These are freed after 5 minutes of idle time NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -4417,7 +4417,7 @@ +@@ -4457,7 +4457,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Max size for data for an internal temporary on-disk MyISAM or Aria table. NUMERIC_MIN_VALUE 1024 @@ -1443,7 +1450,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -4427,7 +4427,7 @@ +@@ -4467,7 +4467,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. Same as tmp_table_size. NUMERIC_MIN_VALUE 0 @@ -1452,7 +1459,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -4437,14 +4437,14 @@ +@@ -4477,14 +4477,14 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Alias for tmp_memory_table_size. If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. NUMERIC_MIN_VALUE 0 @@ -1469,7 +1476,7 @@ VARIABLE_COMMENT Allocation block size for transactions to be stored in binary log NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 134217728 -@@ -4454,7 +4454,7 @@ +@@ -4494,7 +4494,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TRANSACTION_PREALLOC_SIZE VARIABLE_SCOPE SESSION @@ -1478,7 +1485,7 @@ VARIABLE_COMMENT Persistent buffer for transactions to be stored in binary log NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 134217728 -@@ -4594,7 +4594,7 @@ +@@ -4634,7 +4634,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME WAIT_TIMEOUT VARIABLE_SCOPE SESSION @@ -1487,7 +1494,7 @@ VARIABLE_COMMENT The number of seconds the server waits for activity on a connection before closing it NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -4621,7 +4621,7 @@ +@@ -4661,7 +4661,7 @@ VARIABLE_NAME LOG_TC_SIZE GLOBAL_VALUE_ORIGIN AUTO VARIABLE_SCOPE GLOBAL diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result index abf738f5c15..1b4e49f55be 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -12,6 +12,16 @@ variable_name not in ( 'log_tc_size','have_sanitizer' ) order by variable_name; +VARIABLE_NAME ALLOW_SUSPICIOUS_UDFS +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE BOOLEAN +VARIABLE_COMMENT Allows use of user-defined functions (UDFs) consisting of only one symbol xxx() without corresponding xxx_init() or xxx_deinit(). That also means that one can load any function from any library, for example exit() from libc.so +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST OFF,ON +READ_ONLY YES +COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME ALTER_ALGORITHM VARIABLE_SCOPE SESSION VARIABLE_TYPE ENUM @@ -2412,6 +2422,16 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_EXTRA_PRUNING_DEPTH +VARIABLE_SCOPE SESSION +VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_COMMENT If the optimizer needs to enumerate join prefix of this size or larger, then it will try agressively prune away the search space. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 62 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_MAX_SEL_ARG_WEIGHT VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED @@ -2425,9 +2445,9 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_PRUNE_LEVEL VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Controls the heuristic(s) applied during query optimization to prune less-promising partial plans from the optimizer search space. Meaning: 0 - do not apply any heuristic, thus perform exhaustive search; 1 - prune plans based on number of retrieved rows +VARIABLE_COMMENT Controls the heuristic(s) applied during query optimization to prune less-promising partial plans from the optimizer search space. Meaning: 0 - do not apply any heuristic, thus perform exhaustive search: 1 - prune plans based on cost and number of retrieved rows eq_ref: 2 - prune also if we find an eq_ref chain NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 1 +NUMERIC_MAX_VALUE 2 NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO @@ -3582,6 +3602,16 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON READ_ONLY YES COMMAND_LINE_ARGUMENT NULL +VARIABLE_NAME SKIP_GRANT_TABLES +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE BOOLEAN +VARIABLE_COMMENT Start without grant tables. This gives all users FULL ACCESS to all tables. +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST OFF,ON +READ_ONLY YES +COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME SKIP_NAME_RESOLVE VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN @@ -3692,6 +3722,16 @@ NUMERIC_BLOCK_SIZE 1024 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME SLAVE_MAX_STATEMENT_TIME +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT A query that has taken more than slave_max_statement_time seconds to run on the slave will be aborted. The argument will be treated as a decimal value with microsecond precision. A value of 0 (default) means no timeout +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 31536000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_NET_TIMEOUT VARIABLE_SCOPE GLOBAL VARIABLE_TYPE INT UNSIGNED diff --git a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result index df8b7c73f9d..4ca95338e56 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result +++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result @@ -1,6 +1,21 @@ select * from information_schema.system_variables where variable_name like 'wsrep%' order by variable_name; +VARIABLE_NAME WSREP_ALLOWLIST +SESSION_VALUE NULL +GLOBAL_VALUE +GLOBAL_VALUE_ORIGIN COMPILE-TIME +DEFAULT_VALUE +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE VARCHAR +VARIABLE_COMMENT Allowed IP addresses split by comma delimiter +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY YES +COMMAND_LINE_ARGUMENT REQUIRED +GLOBAL_VALUE_PATH NULL VARIABLE_NAME WSREP_AUTO_INCREMENT_CONTROL SESSION_VALUE NULL GLOBAL_VALUE ON diff --git a/mysql-test/suite/sys_vars/t/allow_suspicious_udfs.test b/mysql-test/suite/sys_vars/t/allow_suspicious_udfs.test new file mode 100644 index 00000000000..9179cfbef4d --- /dev/null +++ b/mysql-test/suite/sys_vars/t/allow_suspicious_udfs.test @@ -0,0 +1,14 @@ +--echo # +--echo # MDEV-24815 Show "--allow-suspicious-udfs" state in SYSTEM VARIABLES +--echo # + +SELECT @@allow_suspicious_udfs AS EXPECT_0; + +# Restart the server the server with "--allow-suspicious-udfs" option +--let $restart_parameters = "--allow-suspicious-udfs" +--source include/restart_mysqld.inc +SELECT @@allow_suspicious_udfs AS EXPECT_1; + +# Disable "--allow-suspicious-udfs" to restore the original state +--let $restart_parameters = "--skip-allow-suspicious-udfs" +--source include/restart_mysqld.inc diff --git a/mysql-test/suite/sys_vars/t/completion_type_func.test b/mysql-test/suite/sys_vars/t/completion_type_func.test index 5c343cee9ab..1de4ae88cfb 100644 --- a/mysql-test/suite/sys_vars/t/completion_type_func.test +++ b/mysql-test/suite/sys_vars/t/completion_type_func.test @@ -146,7 +146,7 @@ COMMIT; --echo ## Inserting rows should give error here because connection should ## --echo ## disconnect after using COMMIT ## ---Error 2006,2013,ER_QUERY_INTERRUPTED,ER_CONNECTION_KILLED,5014 +--Error 2006,2013,ER_QUERY_INTERRUPTED,ER_CONNECTION_KILLED,5014,2026 INSERT INTO t1 VALUES(4,'Record_4'); connection test_con2; @@ -160,7 +160,7 @@ INSERT INTO t1 VALUES(12,'Record_12'); ROLLBACK; --echo ## Expect a failure due to COMMIT/ROLLBACK AND RELEASE behavior ## ---Error 2006,2013,ER_QUERY_INTERRUPTED,ER_CONNECTION_KILLED,5014 +--Error 2006,2013,ER_QUERY_INTERRUPTED,ER_CONNECTION_KILLED,5014,2026 INSERT INTO t1 VALUES(4,'Record_4'); connection default; diff --git a/mysql-test/suite/sys_vars/t/innodb_fatal_semaphore_wait_threshold.test b/mysql-test/suite/sys_vars/t/innodb_fatal_semaphore_wait_threshold.test index b1b2f9fdda9..cce150aec02 100644 --- a/mysql-test/suite/sys_vars/t/innodb_fatal_semaphore_wait_threshold.test +++ b/mysql-test/suite/sys_vars/t/innodb_fatal_semaphore_wait_threshold.test @@ -43,7 +43,7 @@ let $counter= 80; let $mysql_errno= 0; while (!$mysql_errno) { - --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,2002,2006,2013,5014 + --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,2002,2006,2013,5014,2026 show status; dec $counter; diff --git a/mysql-test/suite/sys_vars/t/innodb_prefix_index_cluster_optimization_basic.test b/mysql-test/suite/sys_vars/t/innodb_prefix_index_cluster_optimization_basic.test deleted file mode 100644 index 4e272fbd9c5..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_prefix_index_cluster_optimization_basic.test +++ /dev/null @@ -1,76 +0,0 @@ ---source include/have_innodb.inc - -SET @start_global_value = @@global.innodb_prefix_index_cluster_optimization; -SELECT @start_global_value; - ---echo # ---echo # exists as global only ---echo # - ---echo Valid values are 'ON' and 'OFF' -select @@global.innodb_prefix_index_cluster_optimization in (0, 1); -select @@global.innodb_prefix_index_cluster_optimization; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.innodb_prefix_index_cluster_optimization; -show global variables like 'innodb_prefix_index_cluster_optimization'; -show session variables like 'innodb_prefix_index_cluster_optimization'; -select * from information_schema.global_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -select * from information_schema.session_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; - ---echo # ---echo # show that it's writable ---echo # - -set global innodb_prefix_index_cluster_optimization = 'OFF'; -select @@global.innodb_prefix_index_cluster_optimization; -select * from information_schema.global_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -select * from information_schema.session_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -set @@global.innodb_prefix_index_cluster_optimization = 'ON'; -select @@global.innodb_prefix_index_cluster_optimization; -select * from information_schema.global_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -select * from information_schema.session_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -set global innodb_prefix_index_cluster_optimization = 0; -select @@global.innodb_prefix_index_cluster_optimization; -select * from information_schema.global_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -select * from information_schema.session_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -set @@global.innodb_prefix_index_cluster_optimization = 1; -select @@global.innodb_prefix_index_cluster_optimization; -select * from information_schema.global_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -select * from information_schema.session_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; - ---error ER_GLOBAL_VARIABLE -set session innodb_prefix_index_cluster_optimization = 'OFF'; -select @@global.innodb_prefix_index_cluster_optimization; -select * from information_schema.global_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -select * from information_schema.session_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; - ---error ER_GLOBAL_VARIABLE -set @@session.innodb_prefix_index_cluster_optimization = 'ON'; -select @@global.innodb_prefix_index_cluster_optimization; -select * from information_schema.global_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -select * from information_schema.session_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; - ---echo # ---echo # incorrect types ---echo # - ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_prefix_index_cluster_optimization = 1.1; ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_prefix_index_cluster_optimization = 1e1; ---error ER_WRONG_VALUE_FOR_VAR -set global innodb_prefix_index_cluster_optimization = 2; ---error ER_WRONG_VALUE_FOR_VAR -set global innodb_prefix_index_cluster_optimization = -3; -select @@global.innodb_prefix_index_cluster_optimization; -select * from information_schema.global_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; -select * from information_schema.session_variables where variable_name = 'innodb_prefix_index_cluster_optimization'; ---error ER_WRONG_VALUE_FOR_VAR -set global innodb_prefix_index_cluster_optimization = 'AUTO'; - ---echo # ---echo # Cleanup ---echo # - -SET @@global.innodb_prefix_index_cluster_optimization = @start_global_value; -SELECT @@global.innodb_prefix_index_cluster_optimization; diff --git a/mysql-test/suite/sys_vars/t/innodb_version_basic.test b/mysql-test/suite/sys_vars/t/innodb_version_basic.test deleted file mode 100644 index 182841048f7..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_version_basic.test +++ /dev/null @@ -1,30 +0,0 @@ - -# -# 2010-01-27 OBN - Added -# - ---source include/have_innodb.inc - -# -# show the global and session values; -# ---let $inno_ver= `select @@global.innodb_version` ---replace_result $inno_ver x.y.z -select @@global.innodb_version; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.innodb_version; ---echo show global variables like 'innodb_version' disabled so to not change with every version; ---echo show session variables like 'innodb_version' disabled so to not change with every version; ---disable_warnings -select VARIABLE_VALUE=@@global.innodb_version from information_schema.global_variables where variable_name='innodb_version'; -select VARIABLE_VALUE=@@global.innodb_version from information_schema.session_variables where variable_name='innodb_version'; ---enable_warnings - -# -# show that it's read-only -# ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set global innodb_version=1; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set session innodb_version=1; - diff --git a/mysql-test/suite/sys_vars/t/optimizer_prune_level_basic.test b/mysql-test/suite/sys_vars/t/optimizer_prune_level_basic.test index 1e3a8bc3d7f..c857653bc31 100644 --- a/mysql-test/suite/sys_vars/t/optimizer_prune_level_basic.test +++ b/mysql-test/suite/sys_vars/t/optimizer_prune_level_basic.test @@ -60,10 +60,10 @@ SELECT @@session.optimizer_prune_level; ########################################################### SET @@global.optimizer_prune_level = DEFAULT; -SELECT @@global.optimizer_prune_level = 1; +SELECT @@global.optimizer_prune_level = 2; SET @@session.optimizer_prune_level = DEFAULT; -SELECT @@session.optimizer_prune_level = 1; +SELECT @@session.optimizer_prune_level = 2; --echo '#--------------------FN_DYNVARS_115_03-------------------------#' @@ -77,6 +77,8 @@ SET @@global.optimizer_prune_level = 0; SELECT @@global.optimizer_prune_level; SET @@global.optimizer_prune_level = 1; SELECT @@global.optimizer_prune_level; +SET @@global.optimizer_prune_level = 2; +SELECT @@global.optimizer_prune_level; SET @@global.optimizer_prune_level = TRUE; SELECT @@global.optimizer_prune_level; SET @@global.optimizer_prune_level = FALSE; @@ -94,6 +96,8 @@ SET @@session.optimizer_prune_level = 0; SELECT @@session.optimizer_prune_level; SET @@session.optimizer_prune_level = 1; SELECT @@session.optimizer_prune_level; +SET @@session.optimizer_prune_level = 2; +SELECT @@session.optimizer_prune_level; SET @@session.optimizer_prune_level = TRUE; SELECT @@session.optimizer_prune_level; SET @@session.optimizer_prune_level = FALSE; @@ -107,7 +111,7 @@ SELECT @@session.optimizer_prune_level; --Error ER_WRONG_TYPE_FOR_VAR SET @@global.optimizer_prune_level = ON; ---echo 'Bug# 34840: Since it is a boolean variable, it should not give errors on 'ON' & 'OFF' values'; +--echo 'Bug# 34840: Since it is not a boolean variable, it should give errors on 'ON' & 'OFF' values'; --Error ER_WRONG_TYPE_FOR_VAR SET @@global.optimizer_prune_level = OFF; --Error ER_WRONG_TYPE_FOR_VAR @@ -122,9 +126,11 @@ SET @@global.optimizer_prune_level = FELSE; SET @@global.optimizer_prune_level = -1024; SELECT @@global.optimizer_prune_level; ---echo 'Bug# 34840: Since it is a boolean variable, it should give errors on numeric values'; +--echo 'Bug# 34840: Since it is not a boolean variable, it should no give errors on numeric values'; SET @@global.optimizer_prune_level = 65536; +SET @@global.optimizer_prune_level = 3; +select @@global.optimizer_prune_level; --Error ER_WRONG_TYPE_FOR_VAR SET @@global.optimizer_prune_level = 65530.34; --Error ER_WRONG_TYPE_FOR_VAR diff --git a/mysql-test/suite/sys_vars/t/sysvars_innodb.test b/mysql-test/suite/sys_vars/t/sysvars_innodb.test index 6d46c22683f..2680e442da4 100644 --- a/mysql-test/suite/sys_vars/t/sysvars_innodb.test +++ b/mysql-test/suite/sys_vars/t/sysvars_innodb.test @@ -8,7 +8,6 @@ select VARIABLE_NAME, SESSION_VALUE, DEFAULT_VALUE, VARIABLE_SCOPE, VARIABLE_TYPE, VARIABLE_COMMENT, NUMERIC_MIN_VALUE, NUMERIC_MAX_VALUE, NUMERIC_BLOCK_SIZE, ENUM_VALUE_LIST, READ_ONLY, COMMAND_LINE_ARGUMENT from information_schema.system_variables where variable_name like 'innodb%' and variable_name not in ( - 'innodb_version', # always the same as the server version 'innodb_numa_interleave', # only available WITH_NUMA 'innodb_evict_tables_on_commit_debug', # one may want to override this 'innodb_use_native_aio', # default value depends on OS diff --git a/mysql-test/suite/vcol/r/vcol_misc.result b/mysql-test/suite/vcol/r/vcol_misc.result index 17b2f2af00d..eb22e4bfdc5 100644 --- a/mysql-test/suite/vcol/r/vcol_misc.result +++ b/mysql-test/suite/vcol/r/vcol_misc.result @@ -403,7 +403,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` datetime DEFAULT NULL, `b` timestamp GENERATED ALWAYS AS (cast(`a` as datetime)) VIRTUAL, - `c` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' + `c` timestamp NULL DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # diff --git a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs.result b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs.result index 832047a8d6c..99d8dea36dc 100644 --- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs.result +++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs.result @@ -2513,8 +2513,8 @@ create table t1 (a timestamp, b timestamp, c long as (timestampdiff(MONTH, a,b)) show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `b` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `a` timestamp NULL DEFAULT NULL, + `b` timestamp NULL DEFAULT NULL, `c` mediumtext GENERATED ALWAYS AS (timestampdiff(MONTH,`a`,`b`)) VIRTUAL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values ('2003-02-01','2003-05-01',default); diff --git a/mysql-test/suite/versioning/r/partition,heap.rdiff b/mysql-test/suite/versioning/r/partition,heap.rdiff index 387a3cee754..d6c8363fc70 100644 --- a/mysql-test/suite/versioning/r/partition,heap.rdiff +++ b/mysql-test/suite/versioning/r/partition,heap.rdiff @@ -31,7 +31,7 @@ -Table Create Table -tp1 CREATE TABLE `tp1` ( - `x` int(11) NOT NULL AUTO_INCREMENT, -- `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', +- `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', - `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, - `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, - `u` int(11) DEFAULT NULL, @@ -56,7 +56,7 @@ -Table Create Table -t1 CREATE TABLE `t1` ( - `x` int(11) NOT NULL AUTO_INCREMENT, -- `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', +- `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', - `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, - `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, - `u` int(11) DEFAULT NULL, @@ -117,7 +117,7 @@ -Table Create Table -t1 CREATE TABLE `t1` ( - `x` int(11) NOT NULL AUTO_INCREMENT, -- `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', +- `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', - `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, - `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, - `u` int(11) DEFAULT NULL, @@ -154,7 +154,7 @@ -Table Create Table -t1 CREATE TABLE `t1` ( - `x` int(11) NOT NULL AUTO_INCREMENT, -- `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', +- `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', - `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, - `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, - `u` int(11) DEFAULT NULL, @@ -189,7 +189,7 @@ -Table Create Table -t1 CREATE TABLE `t1` ( - `x` int(11) NOT NULL AUTO_INCREMENT, -- `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', +- `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', - `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, - `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, - `u` int(11) DEFAULT NULL, diff --git a/mysql-test/suite/versioning/r/partition.result b/mysql-test/suite/versioning/r/partition.result index 0266464c5d6..4a3f846ae49 100644 --- a/mysql-test/suite/versioning/r/partition.result +++ b/mysql-test/suite/versioning/r/partition.result @@ -2273,7 +2273,7 @@ show create table tp1; Table Create Table tp1 CREATE TABLE `tp1` ( `x` int(11) NOT NULL AUTO_INCREMENT, - `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', + `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, `u` int(11) DEFAULT NULL, @@ -2298,7 +2298,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) NOT NULL AUTO_INCREMENT, - `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', + `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, `u` int(11) DEFAULT NULL, @@ -2915,7 +2915,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) NOT NULL AUTO_INCREMENT, - `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', + `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, `u` int(11) DEFAULT NULL, @@ -2952,7 +2952,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) NOT NULL AUTO_INCREMENT, - `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', + `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, `u` int(11) DEFAULT NULL, @@ -2987,7 +2987,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) NOT NULL AUTO_INCREMENT, - `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', + `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, `c` varchar(1033) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, `u` int(11) DEFAULT NULL, diff --git a/mysql-test/suite/versioning/r/simple.result b/mysql-test/suite/versioning/r/simple.result index df47f80c9e9..39ced386a71 100644 --- a/mysql-test/suite/versioning/r/simple.result +++ b/mysql-test/suite/versioning/r/simple.result @@ -81,7 +81,7 @@ period for system_time(d,e) ) with system versioning; show columns from t1; Field Type Null Key Default Extra -a timestamp(6) NO current_timestamp(6) on update current_timestamp(6) +a timestamp(6) YES NULL b timestamp(6) YES NULL VIRTUAL GENERATED c timestamp(6) YES NULL STORED GENERATED d timestamp(6) NO NULL STORED GENERATED @@ -92,8 +92,8 @@ table_schema test table_name t1 column_name a ordinal_position 1 -column_default current_timestamp(6) -is_nullable NO +column_default NULL +is_nullable YES data_type timestamp character_maximum_length NULL character_octet_length NULL @@ -104,7 +104,7 @@ character_set_name NULL collation_name NULL column_type timestamp(6) column_key -extra on update current_timestamp(6) +extra column_comment is_generated NEVER generation_expression NULL diff --git a/mysql-test/suite/wsrep/r/variables.result b/mysql-test/suite/wsrep/r/variables.result index 8df0210b2d1..2d5d5a66232 100644 --- a/mysql-test/suite/wsrep/r/variables.result +++ b/mysql-test/suite/wsrep/r/variables.result @@ -88,6 +88,7 @@ wsrep_thread_count 2 # variables SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME LIKE "wsrep%" ORDER BY VARIABLE_NAME; VARIABLE_NAME +WSREP_ALLOWLIST WSREP_AUTO_INCREMENT_CONTROL WSREP_CAUSAL_READS WSREP_CERTIFICATION_RULES diff --git a/mysql-test/suite/wsrep/r/variables_debug.result b/mysql-test/suite/wsrep/r/variables_debug.result index 109b25cd898..2ce69827911 100644 --- a/mysql-test/suite/wsrep/r/variables_debug.result +++ b/mysql-test/suite/wsrep/r/variables_debug.result @@ -89,6 +89,7 @@ wsrep_thread_count 2 # variables SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME LIKE "wsrep%" ORDER BY VARIABLE_NAME; VARIABLE_NAME +WSREP_ALLOWLIST WSREP_AUTO_INCREMENT_CONTROL WSREP_CAUSAL_READS WSREP_CERTIFICATION_RULES diff --git a/mysql-test/suite/wsrep/t/variables.test b/mysql-test/suite/wsrep/t/variables.test index e40ac7b8772..c28638e78f1 100644 --- a/mysql-test/suite/wsrep/t/variables.test +++ b/mysql-test/suite/wsrep/t/variables.test @@ -3,7 +3,7 @@ --source include/have_innodb.inc --source include/galera_no_debug_sync.inc ---let $galera_version=26.4.9 +--let $galera_version=26.4.11 source include/check_galera_version.inc; source include/galera_variables_ok.inc; diff --git a/mysql-test/suite/wsrep/t/variables_debug.test b/mysql-test/suite/wsrep/t/variables_debug.test index 29747e48f18..5e90d61c84e 100644 --- a/mysql-test/suite/wsrep/t/variables_debug.test +++ b/mysql-test/suite/wsrep/t/variables_debug.test @@ -5,7 +5,7 @@ --source include/have_debug_sync.inc --source include/galera_have_debug_sync.inc ---let $galera_version=26.4.9 +--let $galera_version=26.4.11 source include/check_galera_version.inc; source include/galera_variables_ok.inc; |