Commit a99f47e2 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
parents d8fa9819 91faec36

client/mysqltest.c

+539 −608

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/include/master-slave.inc

+4 −2
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ connection slave; 
--disable_warnings

stop slave;

--enable_warnings

@r/slave-stopped.result show status like 'Slave_running';

--require r/slave-stopped.result 

show status like 'Slave_running';

connection master;

--disable_warnings

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
@@ -21,7 +22,8 @@ reset slave; 
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

--enable_warnings

start slave;

@r/slave-running.result show status like 'Slave_running';

--require r/slave-running.result

show status like 'Slave_running';



# Set the default connection to 'master'

connection master;

mysql-test/include/ps_query.inc

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ execute stmt1; 


##### parameter used for keyword like SELECT (must fail)

set @arg00='SELECT' ;

# mysqltest gives no output for the next statement, Why ??

--error 1064

@arg00 a from t1 where a=1;

--error 1064

mysql-test/r/mysqltest.result

+3 −0
Original line number Diff line number Diff line
@@ -149,6 +149,9 @@ hello 
mysqltest: At line 1: End of line junk detected: "6"

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

mysqltest: At line 1: Missing delimiter

mysqltest: End of line junk detected: "sleep 7

# Another comment

"

mysqltest: At line 1: Extra delimiter ";" found

mysqltest: At line 1: Extra delimiter ";" found

MySQL

mysql-test/r/ps_2myisam.result

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 c19 c20 c21 c22 c 
1	1	1	1	1	1	1	1	1	1	1.0000	1.0000	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday

9	9	9	9	9	9	9	9	9	9	9.0000	9.0000	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	0	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	two	tuesday

set @arg00='SELECT' ;

@arg00 a from t1 where a=1;

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 '@arg00 a from t1 where a=1' at line 1

prepare stmt1 from ' ? a from t1 where a=1 ';

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 '? a from t1 where a=1' at line 1

set @arg00=1 ;