diff --git a/client/mysqltest.c b/client/mysqltest.c index fdd3ded3d94416538bf98e140bc0c16ea9521723..c968fb2a33affd147523b62fab835d2b63232614 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -2431,7 +2431,7 @@ int read_line(char *buf, int size) break; case R_LINE_START: /* Only accept start of comment if this is the first line in query */ - if ((*lineno == start_lineno) && (c == '#' || c == '-' || parsing_diabled)) + if ((*lineno == start_lineno) && (c == '#' || c == '-' || parsing_disabled)) { state = R_COMMENT; } diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test index 23f88b75576aaefac4daa60e8468c53bda7f1964..6be193e0e0c2aba5012d6e146625bb981d8d29ee 100644 --- a/mysql-test/t/information_schema.test +++ b/mysql-test/t/information_schema.test @@ -253,7 +253,7 @@ flush privileges; # QQ a LOCK TABLES is in effect when selecting from # QQ information_schema.tables. ---disable_parsing until bug is fixes +--disable_parsing # until bug is fixed delimiter //; create procedure px5 () begin diff --git a/mysql-test/t/rpl_slave_status.test b/mysql-test/t/rpl_slave_status.test index 7e16097edd0ee46f6731183d603da77d4b58b9a2..687f7b64efed0c01b07ee7672b74ccb5f42c314c 100644 --- a/mysql-test/t/rpl_slave_status.test +++ b/mysql-test/t/rpl_slave_status.test @@ -1,5 +1,5 @@ # Test case for BUG #10780 -source include/master-slave.inc +source include/master-slave.inc; connection master; grant replication slave on *.* to rpl@127.0.0.1 identified by 'rpl'; connection slave; diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test index f1662a57c1ba22f4538d4711d7399ed0bb2a9c12..d52ebbbbf67c92793e74495083f626365cedd432 100644 --- a/mysql-test/t/sp.test +++ b/mysql-test/t/sp.test @@ -1213,7 +1213,7 @@ end| select f5(1)| # This should generate an error about insuficient number of tables locked # Now this crash server ---disable_parsing until bug#11394 fix +--disable_parsing # until bug#11394 fix --error 1100 select f5(2)| # But now it simply miserably fails because we are trying to use the same @@ -2469,7 +2469,7 @@ drop table t3| # BUG#4318 # ---disable_parsing Don't know if HANDLER commands can work with SPs, or at all.. +--disable_parsing # Don't know if HANDLER commands can work with SPs, or at all.. create table t3 (s1 int)| insert into t3 values (3), (4)| @@ -2836,7 +2836,7 @@ drop table t3| # BUG#6022: Stored procedure shutdown problem with self-calling function. # ---disable_parsing until we implement support for recursive stored functions. +--disable_parsing # until we implement support for recursive stored functions. --disable_warnings drop function if exists bug6022| --enable_warnings @@ -3762,7 +3762,7 @@ drop procedure if exists bug7088_1| drop procedure if exists bug7088_2| --enable_warnings ---disable_parsing temporarily disabled until Bar fixes BUG#11986 +--disable_parsing # temporarily disabled until Bar fixes BUG#11986 create procedure bug6063() l鈈el: begin end| call bug6063()| diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test index d786b61c8a8374afd9c3cc1c5bbd34f3c2a8af63..c4180ab5969e853bd96598f014d0e05eb5fd7a00 100644 --- a/mysql-test/t/view.test +++ b/mysql-test/t/view.test @@ -147,7 +147,7 @@ insert into t1 values (1), (2), (3); create view v1 (a) as select a+1 from t1; create view v2 (a) as select a-1 from t1; ---disable_parsing WL #2486 should enable these tests +--disable_parsing # WL #2486 should enable these tests select * from t1 natural left join v1; select * from v2 natural left join t1; select * from v2 natural left join v1;