diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-07-27 12:22:00 -0600 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-07-27 12:22:00 -0600 |
| commit | ced93a5cc8fb3822e63a20359aa68cc54ffb2d4a (patch) | |
| tree | 00a61c4cc45ca89121a957283226b4b666b7a0fc /mysql-test/t/show_check.test | |
| parent | 5a03bfbbce3f8bb9b7a3e9655d167ea6625e654e (diff) | |
| parent | cc5b3745661bdf5328c87e7045abe8ec7d9b1522 (diff) | |
| download | mariadb-git-ced93a5cc8fb3822e63a20359aa68cc54ffb2d4a.tar.gz | |
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into weblab.(none):/home/marcsql/TREE/mysql-5.1-25422-d
client/mysqldump.c:
Auto merged
mysql-test/r/log_state.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/t/show_check.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sp.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/show_check.test')
| -rw-r--r-- | mysql-test/t/show_check.test | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test index d7596d1be57..77ba1b22065 100644 --- a/mysql-test/t/show_check.test +++ b/mysql-test/t/show_check.test @@ -438,6 +438,11 @@ drop table if exists t1; CREATE TABLE txt1(a int); CREATE TABLE tyt2(a int); CREATE TABLE urkunde(a int); + +# make the output deterministic: +# the order used in SHOW OPEN TABLES +# is too much implementation dependent +--disable_ps_protocol FLUSH TABLES; SELECT 1 FROM mysql.db, mysql.proc, mysql.user, mysql.time_zone, mysql.time_zone_name, txt1, tyt2, urkunde LIMIT 0; SHOW OPEN TABLES; @@ -447,6 +452,8 @@ SHOW OPEN TABLES LIKE 't%'; SHOW OPEN TABLES LIKE '%o%'; FLUSH TABLES; SHOW OPEN TABLES; +--enable_ps_protocol + DROP TABLE txt1; DROP TABLE tyt2; DROP TABLE urkunde; |