diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
| commit | 76f0b94bb0b2994d639353530c5b251d0f1a204b (patch) | |
| tree | 9ed50628aac34f89a37637bab2fc4915b86b5eb4 /mysql-test/suite/optimizer_unfixed_bugs/r/bug41996-extra1.result | |
| parent | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff) | |
| parent | 5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff) | |
| download | mariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz | |
merge with 5.3
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
Diffstat (limited to 'mysql-test/suite/optimizer_unfixed_bugs/r/bug41996-extra1.result')
| -rw-r--r-- | mysql-test/suite/optimizer_unfixed_bugs/r/bug41996-extra1.result | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996-extra1.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996-extra1.result index 94b024a9c8f..ab24c2c1166 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996-extra1.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996-extra1.result @@ -1,4 +1,5 @@ -set optimizer_use_mrr='disable'; +set @bug41996_tmp=@@optimizer_switch; +set optimizer_switch='mrr=off'; DROP DATABASE IF EXISTS d1; DROP DATABASE IF EXISTS d2; DROP DATABASE IF EXISTS d3; @@ -1106,3 +1107,4 @@ c1 c2 DROP DATABASE d1; DROP DATABASE d2; DROP DATABASE d3; +set optimizer_switch=@bug41996_tmp; |