diff options
| author | unknown <evgen@moonbone.local> | 2006-08-17 18:50:53 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-08-17 18:50:53 +0400 |
| commit | 1cbebc6e18e22d10b4be12634f5c6d2ed72cffca (patch) | |
| tree | da0c3e59542392b61f87703d2a73520d61383a28 | |
| parent | 5a76d760073a3f7fed5e8351b093effce013d609 (diff) | |
| download | mariadb-git-1cbebc6e18e22d10b4be12634f5c6d2ed72cffca.tar.gz | |
ndb_condition_pushdown.result:
Corrected test case result after fix for bug#18165
view.result, view.test:
Corrected test case for bug#21261
mysql-test/t/view.test:
Corrected test case for bug#21261
mysql-test/r/view.result:
Corrected test case for bug#21261
mysql-test/r/ndb_condition_pushdown.result:
Corrected test case result after fix for bug#18165
| -rw-r--r-- | mysql-test/r/ndb_condition_pushdown.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/view.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/view.test | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/r/ndb_condition_pushdown.result b/mysql-test/r/ndb_condition_pushdown.result index 4e5597a4851..aefbcbf6ede 100644 --- a/mysql-test/r/ndb_condition_pushdown.result +++ b/mysql-test/r/ndb_condition_pushdown.result @@ -1307,7 +1307,7 @@ select auto from t1 where ('1901-01-01 01:01:01' between date_time and date_time) order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 4 Using where with pushed condition; Using filesort +1 SIMPLE t1 range medium_index medium_index 3 NULL 10 Using where with pushed condition; Using filesort select auto from t1 where ("aaaa" between string and string) and ("aaaa" between vstring and vstring) and @@ -1409,7 +1409,7 @@ select auto from t1 where ('1901-01-01 01:01:01' not between date_time and date_time) order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 4 Using where with pushed condition; Using filesort +1 SIMPLE t1 range medium_index medium_index 3 NULL 20 Using where with pushed condition; Using filesort select auto from t1 where ("aaaa" not between string and string) and ("aaaa" not between vstring and vstring) and diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index c6bd6b8321b..5b170d056f7 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -2851,6 +2851,7 @@ t1 DROP TABLE t1; DROP VIEW IF EXISTS v1; CREATE DATABASE bug21261DB; +USE bug21261DB; CREATE TABLE t1 (x INT); CREATE SQL SECURITY INVOKER VIEW v1 AS SELECT x FROM t1; GRANT INSERT, UPDATE ON v1 TO 'user21261'@'localhost'; @@ -2869,6 +2870,7 @@ DROP USER 'user21261'@'localhost'; DROP VIEW v1; DROP TABLE t1; DROP DATABASE bug21261DB; +USE test; create table t1 (f1 datetime); create view v1 as select * from t1 where f1 between now() and now() + interval 1 minute; show create view v1; diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test index 9db60a129a2..23e49588e8b 100644 --- a/mysql-test/t/view.test +++ b/mysql-test/t/view.test @@ -2723,6 +2723,7 @@ DROP VIEW IF EXISTS v1; # Bug #21261: Wrong access rights was required for an insert to a view # CREATE DATABASE bug21261DB; +USE bug21261DB; CONNECT (root,localhost,root,,bug21261DB); CONNECTION root; @@ -2748,6 +2749,7 @@ DROP USER 'user21261'@'localhost'; DROP VIEW v1; DROP TABLE t1; DROP DATABASE bug21261DB; +USE test; # # Bug #15950: NOW() optimized away in VIEWs |