diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-09 09:52:15 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-09 09:52:15 +0200 |
| commit | 75d631f333544de4487a6dd251d6f361e1d55d6b (patch) | |
| tree | 4e234afa19a458b9b0727859c53c290c683a502d /mysql-test/suite/engines | |
| parent | 9cbf8ccf2990f9db8d9debee42bc9213cbb04457 (diff) | |
| parent | 1d480419822b53c840de54542c1d1a0851dbe2c8 (diff) | |
| download | mariadb-git-75d631f333544de4487a6dd251d6f361e1d55d6b.tar.gz | |
Merge branch '10.7' into 10.8
Diffstat (limited to 'mysql-test/suite/engines')
| -rw-r--r-- | mysql-test/suite/engines/funcs/r/rpl_sp.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/engines/funcs/r/rpl_sp.result b/mysql-test/suite/engines/funcs/r/rpl_sp.result index 71177d6a2f5..00b15c36baa 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/*!*/; +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=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; |