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/t/derived.test | |
| 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/t/derived.test')
| -rw-r--r-- | mysql-test/t/derived.test | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/t/derived.test b/mysql-test/t/derived.test index a2681b82d26..6cc3db739f6 100644 --- a/mysql-test/t/derived.test +++ b/mysql-test/t/derived.test @@ -332,8 +332,9 @@ CREATE algorithm=temptable VIEW v1 AS CREATE algorithm=temptable VIEW v2 AS SELECT 1 FROM t2; # This caused the assert to be triggered. ---error ER_SUBQUERY_NO_1_ROW EXPLAIN SELECT 1 FROM t1 JOIN v1 ON 1 > (SELECT 1 FROM v2); +--error ER_SUBQUERY_NO_1_ROW +SELECT 1 FROM t1 JOIN v1 ON 1 > (SELECT 1 FROM v2); DROP TABLE t1, t2; DROP VIEW v1, v2; |