Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0
into devsrv-b.mysql.com:/space/magnus/my50-bug11731
This commit is contained in:
commit
2883e932ef
@ -391,3 +391,25 @@ root@localhost
|
|||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
this will be executed
|
this will be executed
|
||||||
this will be executed
|
this will be executed
|
||||||
|
mysqltest: At line 2: 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
|
||||||
|
drop table t1;
|
||||||
|
drop table t1;
|
||||||
|
create table t1 (a int primary key);
|
||||||
|
insert into t1 values (1);
|
||||||
|
select 'select-me';
|
||||||
|
insertz error query||||
|
||||||
|
select-me
|
||||||
|
select-me
|
||||||
|
ERROR 42000: 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
|
||||||
|
drop table t1;
|
||||||
|
create table t1 (a int primary key);
|
||||||
|
insert into t1 values (1);
|
||||||
|
select 'select-me';
|
||||||
|
insertz error query||||
|
||||||
|
select-me
|
||||||
|
select-me
|
||||||
|
ERROR 42000: 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
|
||||||
|
drop table t1;
|
||||||
|
@ -945,3 +945,49 @@ select "this will not be executed";
|
|||||||
--enable_parsing
|
--enable_parsing
|
||||||
select "this will be executed";
|
select "this will be executed";
|
||||||
--enable_query_log
|
--enable_query_log
|
||||||
|
|
||||||
|
|
||||||
|
#
|
||||||
|
# Bug #11731 mysqltest in multi-statement queries ignores errors in
|
||||||
|
# non-1st queries
|
||||||
|
#
|
||||||
|
|
||||||
|
# Failing multi statement query
|
||||||
|
--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
|
||||||
|
--exec echo "insertz 'error query'||||" >> var/tmp/bug11731.sql
|
||||||
|
--exec echo "delimiter ;||||" >> var/tmp/bug11731.sql
|
||||||
|
|
||||||
|
--error 1
|
||||||
|
--exec $MYSQL_TEST -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql 2>&1
|
||||||
|
drop table t1;
|
||||||
|
|
||||||
|
--error 1
|
||||||
|
--exec $MYSQL_TEST --record -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql -R $MYSQL_TEST_DIR/var/tmp/bug11731.out
|
||||||
|
# The .out file should be empty, cat will fail!
|
||||||
|
--error 1
|
||||||
|
--exec cat $MYSQL_TEST_DIR/var/tmp/bug11731.out
|
||||||
|
drop table t1;
|
||||||
|
|
||||||
|
|
||||||
|
# Using expected error
|
||||||
|
--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
|
||||||
|
--exec echo "select 'select-me';" >> var/tmp/bug11731.sql
|
||||||
|
--exec echo "insertz "error query"||||" >> var/tmp/bug11731.sql
|
||||||
|
--exec echo "delimiter ;||||" >> var/tmp/bug11731.sql
|
||||||
|
|
||||||
|
# These two should work since the error is expected
|
||||||
|
--exec $MYSQL_TEST -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql 2>&1
|
||||||
|
drop table t1;
|
||||||
|
|
||||||
|
--exec $MYSQL_TEST --record -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql -R $MYSQL_TEST_DIR/var/tmp/bug11731.out
|
||||||
|
--exec cat $MYSQL_TEST_DIR/var/tmp/bug11731.out
|
||||||
|
drop table t1;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user