Commit 8ea0d511 authored by unknown's avatar unknown
Browse files

Fix for mysqltest.test failing with mysql-test-run.pl and --ps-protocol 


mysql-test/r/mysqltest.result:
  Update test result
mysql-test/t/mysqltest.test:
  Disable ps_protocol for multi statement
parent e236de83

mysql-test/r/mysqltest.result

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ root@localhost 
--------------------------------------------------------------------------------

this will be executed

this will be executed

mysqltest: At line 2: query 'create table t1 (a int primary key);

mysqltest: At line 3: query 'create table t1 (a int primary key);

insert into t1 values (1);

select 'select-me';

insertz 'error query'' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insertz 'error query'' at line 1

mysql-test/t/mysqltest.test

+6 −2
Original line number Diff line number Diff line
@@ -953,7 +953,9 @@ select "this will be executed"; 
#



# Failing multi statement query

--exec echo "delimiter ||||;"                          > var/tmp/bug11731.sql

# PS does not support multi statement

--exec echo "--disable_ps_protocol"                    > var/tmp/bug11731.sql

--exec echo "delimiter ||||;"                         >> var/tmp/bug11731.sql

--exec echo "create table t1 (a int primary key);"    >> var/tmp/bug11731.sql

--exec echo "insert into t1 values (1);"              >> var/tmp/bug11731.sql

--exec echo "select 'select-me';"                     >> var/tmp/bug11731.sql
@@ -973,7 +975,9 @@ drop table t1; 




# Using expected error

--exec echo "delimiter ||||;"                          > var/tmp/bug11731.sql

# PS does not support multi statement

--exec echo "--disable_ps_protocol"                    > var/tmp/bug11731.sql

--exec echo "delimiter ||||;"                         >> var/tmp/bug11731.sql

--exec echo "--error 1064"                            >> var/tmp/bug11731.sql

--exec echo "create table t1 (a int primary key);"    >> var/tmp/bug11731.sql

--exec echo "insert into t1 values (1);"              >> var/tmp/bug11731.sql