diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-03 10:47:52 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-03 12:19:59 +0200 |
| commit | d2f1c3ed6ccf823babf311970dfa0b7c57850db7 (patch) | |
| tree | 7c3db13f204c0a0c08f48ddaa402e64a2e209192 /mysql-test/suite/engines/funcs | |
| parent | 212994f704496d01881f377e34e04bd007e5e298 (diff) | |
| parent | af143474d8925cdbcfc0795a2bc274cbeaad8889 (diff) | |
| download | mariadb-git-d2f1c3ed6ccf823babf311970dfa0b7c57850db7.tar.gz | |
Merge branch '10.5' into bb-10.6-release
Diffstat (limited to 'mysql-test/suite/engines/funcs')
| -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 *//*!*/; |