diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-10-31 13:36:03 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-10-31 13:36:03 +0100 |
| commit | a99f47e2827994297dacd69834630fcd0ee2549b (patch) | |
| tree | 4e53f0757cbf373dc16fb6d0579d649440c39400 /mysql-test/include | |
| parent | d8fa981918d0a98fb83db4733542a61312fbff6c (diff) | |
| parent | 91faec36f9e2591e09a602d6064e9a67dae69ded (diff) | |
| download | mariadb-git-a99f47e2827994297dacd69834630fcd0ee2549b.tar.gz | |
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
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/master-slave.inc | 6 | ||||
| -rw-r--r-- | mysql-test/include/ps_query.inc | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/include/master-slave.inc b/mysql-test/include/master-slave.inc index 5ec4b4379f8..ea09f4e842b 100644 --- a/mysql-test/include/master-slave.inc +++ b/mysql-test/include/master-slave.inc @@ -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; diff --git a/mysql-test/include/ps_query.inc b/mysql-test/include/ps_query.inc index 27a86f88231..e96d666eaec 100644 --- a/mysql-test/include/ps_query.inc +++ b/mysql-test/include/ps_query.inc @@ -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 |