diff options
author | Monty <monty@mariadb.org> | 2019-09-02 14:06:56 +0300 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2019-09-03 13:17:32 +0300 |
commit | a071e0e029cd7c155cff1054d9f7f8a6aa898620 (patch) | |
tree | b592c10cb8ca3036688ea19039208eadd485fe7c /mysql-test/main/subselect2.result | |
parent | b0ff5a6a7393c057cd201aff63279e45d3e0cc49 (diff) | |
parent | 9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (diff) | |
download | mariadb-git-a071e0e029cd7c155cff1054d9f7f8a6aa898620.tar.gz |
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/subselect2.result')
-rw-r--r-- | mysql-test/main/subselect2.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/subselect2.result b/mysql-test/main/subselect2.result index cae0f2286c1..72f6a8b5612 100644 --- a/mysql-test/main/subselect2.result +++ b/mysql-test/main/subselect2.result @@ -383,7 +383,7 @@ key_code value_string DEALLOCATE PREPARE stmt; DROP VIEW v1; DROP TABLE t1,t2,t3; -set optimizer_switch=@subselect2_test_tmp; +set optimizer_switch=@save_optimizer_switch; create table t1 (a int); create table t2 (a int); create table t3(a int); |