Commit 76c1bcf9 authored by unknown's avatar unknown
Browse files

BUG#11316: mysqltest, problems when assigning value with '#' to $variable 

 - Add stricter checking of syntax in mysqltest


client/mysqltest.c:
  Stricter checking of syntax in mysqltest.
mysql-test/r/mysqltest.result:
  Update test results
mysql-test/t/create.test:
  Remove extra ;
mysql-test/t/create_select_tmp.test:
  Remove extra ;
mysql-test/t/drop.test:
  Remove extra ;
mysql-test/t/flush.test:
  Remove extra ;
mysql-test/t/handler.test:
  Remove extra ;
mysql-test/t/innodb.test:
  Remove extra ;
mysql-test/t/mysqltest.test:
  Add more tests for replace, replace_columns, comments with commands and sync_with_master
mysql-test/t/rpl000001.test:
  Remove extra ;
mysql-test/t/rpl_EE_error.test:
  Remove extra ;
mysql-test/t/rpl_drop.test:
  Remove extra ;
mysql-test/t/rpl_error_ignored_table.test:
  Remove extra ;
mysql-test/t/rpl_loaddata.test:
  Remove extra ;
parent 9b5b5d6f

client/mysqltest.c

+415 −444

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/r/mysqltest.result

+30 −2
Original line number Diff line number Diff line
@@ -308,13 +308,41 @@ test2 
test3

test4

1

mysqltest: In included file "./include/mysqltest_while.inc": At line 32: Nesting too deeply

mysqltest: In included file "./include/mysqltest_while.inc": At line 64: Nesting too deeply

mysqltest: At line 1: missing '(' in while

mysqltest: At line 1: missing ')' in while

mysqltest: At line 1: Missing '{' after while. Found "dec $i"

mysqltest: At line 1: Stray '}' - end of block before beginning

mysqltest: At line 1: Stray '}' - end of block before beginning

mysqltest: At line 1: Stray 'end' command - end of block before beginning

mysqltest: At line 1: query '' failed: 1065: Query was empty

mysqltest: At line 1: Missing '{' after while. Found "echo hej"

mysqltest: At line 3: Missing end of block

mysqltest: At line 1: Missing newline between while and '{'

mysqltest: At line 1: missing '(' in if

mysqltest: At line 1: Stray 'end' command - end of block before beginning

select "b" bs col1, "c" bs col2;

col1	col2

b	c

seledt "b" bs dol1, "d" bs dol2;

dol1	dol2

b	d

mysqltest: At line 1: Wrong number of arguments to replace_result in 'replace_result a'

mysqltest: At line 1: Wrong number of arguments to replace_result in 'replace_result a;'

mysqltest: At line 1: Wrong number of arguments to replace_result in 'replace_result a'

mysqltest: At line 1: Wrong number of arguments to replace_result in 'replace_result a '

mysqltest: At line 1: Wrong number of arguments to replace_result in 'replace_result a b c'

mysqltest: At line 1: Wrong number of arguments to replace_result in 'replace_result a b c '

select "a" as col1, "c" as col2;

col1	col2

b	c

select "a" as col1, "c" as col2;

col1	col2

b	d

mysqltest: At line 1: Wrong column number to replace_column in 'replace_column a'

mysqltest: At line 1: Wrong number of arguments to replace_column in 'replace_column 1'

mysqltest: At line 1: Wrong column number to replace_column in 'replace_column a b'

mysqltest: At line 1: Wrong column number to replace_column in 'replace_column a 1'

mysqltest: At line 1: Wrong column number to replace_column in 'replace_column 1 b c '

mysqltest: At line 1: Invalid integer argument "10!"

mysqltest: At line 1: End of line junk detected: "!"

mysqltest: At line 1: Invalid integer argument "a"

mysql-test/t/create.test

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ drop table t1; 
create table `t1 `(a int);

--error 1102

create database `db1 `;

--error 1166;

--error 1166

create table t1(`a ` int);



#

mysql-test/t/create_select_tmp.test

+8 −8
Original line number Diff line number Diff line
@@ -11,19 +11,19 @@ drop table if exists t1, t2; 
--enable_warnings

CREATE TABLE t1 ( a int );

INSERT INTO t1 VALUES (1),(2),(1);

--error 1062;

--error 1062

CREATE TABLE t2 ( PRIMARY KEY (a) ) ENGINE=INNODB SELECT a FROM t1;

--error 1146;

--error 1146

select * from t2;

--error 1062;

--error 1062

CREATE TEMPORARY TABLE t2 ( PRIMARY KEY (a) ) ENGINE=INNODB SELECT a FROM t1;

--error 1146;

--error 1146

select * from t2;

--error 1062;

--error 1062

CREATE TABLE t2 ( PRIMARY KEY (a) ) ENGINE=MYISAM SELECT a FROM t1;

--error 1146;

--error 1146

select * from t2;

--error 1062;

--error 1062

CREATE TEMPORARY TABLE t2 ( PRIMARY KEY (a) ) ENGINE=MYISAM SELECT a FROM t1;

--error 1146;

--error 1146

select * from t2;

mysql-test/t/drop.test

+5 −5
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ drop database if exists mysqltest; 
drop database if exists client_test_db;

--enable_warnings



--error 1051;

--error 1051

drop table t1;

create table t1(n int);

insert into t1 values(1);

create temporary table t1( n int);

insert into t1 values(2);

--error 1050;

--error 1050

create table t1(n int);

drop table t1;

select * from t1;
@@ -56,13 +56,13 @@ drop database mysqltest; 


# test drop/create database and FLUSH TABLES WITH READ LOCK

flush tables with read lock;

--error 1209,1223;

--error 1209,1223

create database mysqltest;

unlock tables;

create database mysqltest;

show databases;

flush tables with read lock;

--error 1208,1223;

--error 1208,1223

drop database mysqltest;

unlock tables;

drop database mysqltest;
@@ -73,7 +73,7 @@ drop database mysqltest; 
# test create table and FLUSH TABLES WITH READ LOCK

drop table t1;

flush tables with read lock;

--error 1223;

--error 1223

create table t1(n int);

unlock tables;

create table t1(n int);