diff options
| -rw-r--r-- | mysql-test/r/multi_update.result | 1 | ||||
| -rw-r--r-- | mysql-test/r/subselect.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/multi_update.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/subselect.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/system_mysql_db_fix.test | 4 |
5 files changed, 8 insertions, 2 deletions
diff --git a/mysql-test/r/multi_update.result b/mysql-test/r/multi_update.result index 2b312a86289..d8c70625e35 100644 --- a/mysql-test/r/multi_update.result +++ b/mysql-test/r/multi_update.result @@ -446,6 +446,7 @@ grant update on mysqltest.t1 to mysqltest_1@localhost; update t1, t2 set t1.b=1 where t1.a=t2.a; update t1, t2 set t1.b=(select t3.b from t3 where t1.a=t3.a) where t1.a=t2.a; revoke all privileges on mysqltest.t1 from mysqltest_1@localhost; +revoke all privileges on mysqltest.* from mysqltest_1@localhost; delete from mysql.user where user='mysqltest_1'; drop database mysqltest; create table t1 (a int, primary key (a)); diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result index 9ad3a5a9cf2..a6ff608ab66 100644 --- a/mysql-test/r/subselect.result +++ b/mysql-test/r/subselect.result @@ -334,7 +334,7 @@ Note 1276 Field or reference 'clinic_uq' of SELECT #2 was resolved in SELECT #1 Note 1003 select test.t6.patient_uq AS `patient_uq`,test.t6.clinic_uq AS `clinic_uq` from test.t6 where exists(select test.t7.uq AS `uq`,test.t7.name AS `name` from test.t7 where (test.t7.uq = test.t6.clinic_uq)) select * from t1 where a= (select a from t2,t4 where t2.b=t4.b); ERROR 23000: Column: 'a' in field list is ambiguous -drop table if exists t1,t2,t3; +drop table t1,t2,t3; CREATE TABLE t3 (a varchar(20),b char(1) NOT NULL default '0'); INSERT INTO t3 VALUES ('W','a'),('A','c'),('J','b'); CREATE TABLE t2 (a varchar(20),b int NOT NULL default '0'); diff --git a/mysql-test/t/multi_update.test b/mysql-test/t/multi_update.test index 36854551a7f..492856f9280 100644 --- a/mysql-test/t/multi_update.test +++ b/mysql-test/t/multi_update.test @@ -404,6 +404,7 @@ update t1, t2 set t1.b=1 where t1.a=t2.a; update t1, t2 set t1.b=(select t3.b from t3 where t1.a=t3.a) where t1.a=t2.a; connection root; revoke all privileges on mysqltest.t1 from mysqltest_1@localhost; +revoke all privileges on mysqltest.* from mysqltest_1@localhost; delete from mysql.user where user='mysqltest_1'; drop database mysqltest; diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test index 0f461ba5277..bdefc87b3fd 100644 --- a/mysql-test/t/subselect.test +++ b/mysql-test/t/subselect.test @@ -135,7 +135,7 @@ explain extended select * from t6 where exists (select * from t7 where uq = clin select * from t1 where a= (select a from t2,t4 where t2.b=t4.b); # different tipes & group functions -drop table if exists t1,t2,t3; +drop table t1,t2,t3; CREATE TABLE t3 (a varchar(20),b char(1) NOT NULL default '0'); INSERT INTO t3 VALUES ('W','a'),('A','c'),('J','b'); diff --git a/mysql-test/t/system_mysql_db_fix.test b/mysql-test/t/system_mysql_db_fix.test index 6f3979bf66e..41fbdec84e7 100644 --- a/mysql-test/t/system_mysql_db_fix.test +++ b/mysql-test/t/system_mysql_db_fix.test @@ -74,5 +74,9 @@ DROP TABLE user; DROP TABLE func;
DROP TABLE tables_priv;
DROP TABLE columns_priv;
+DROP TABLE help_category; +DROP TABLE help_keyword; +DROP TABLE help_relation; +DROP TABLE help_topic; -- enable_query_log
|