diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-26 10:45:47 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-26 10:45:47 +0300 |
| commit | 6a042281bdbfe91cc39e1f6e02295bfe7eaa9d43 (patch) | |
| tree | 54ae0a1b6b234dd1a1b6c4c93528be18197365e4 /mysql-test/suite/sys_vars | |
| parent | 65f30050aafb3821ba63a3b837c98cf4d2334254 (diff) | |
| parent | 21a96581fd1dd11c5605dd89e3adbaabdf6de5eb (diff) | |
| download | mariadb-git-6a042281bdbfe91cc39e1f6e02295bfe7eaa9d43.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/suite/sys_vars')
| -rw-r--r-- | mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/r/unique_checks_basic.result | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result b/mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result index 834d693edb8..0bf9d859d40 100644 --- a/mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result +++ b/mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result @@ -7,7 +7,7 @@ SET @@session.foreign_key_checks = 1; SET @@session.foreign_key_checks = DEFAULT; SELECT @@session.foreign_key_checks; @@session.foreign_key_checks -0 +1 '#---------------------FN_DYNVARS_032_02-------------------------#' SET foreign_key_checks = 1; SELECT @@foreign_key_checks; diff --git a/mysql-test/suite/sys_vars/r/unique_checks_basic.result b/mysql-test/suite/sys_vars/r/unique_checks_basic.result index 60cf2795309..83fb9edb4cd 100644 --- a/mysql-test/suite/sys_vars/r/unique_checks_basic.result +++ b/mysql-test/suite/sys_vars/r/unique_checks_basic.result @@ -7,7 +7,7 @@ SET @@session.unique_checks= 1; SET @@session.unique_checks= DEFAULT; SELECT @@session.unique_checks; @@session.unique_checks -0 +1 '#--------------------FN_DYNVARS_005_04-------------------------#' SET @@session.unique_checks =1; SELECT @@session.unique_checks; |