diff options
author | unknown <holyfoot/hf@deer.(none)> | 2006-10-24 15:43:10 +0500 |
---|---|---|
committer | unknown <holyfoot/hf@deer.(none)> | 2006-10-24 15:43:10 +0500 |
commit | 0eb21ee474dbca7c638f1142e3317c34ca86611f (patch) | |
tree | bed368050d5c0541befd9108b4934b80970b0cac /mysql-test/t/status.test | |
parent | 9852dfbcf5d3bfb5eec4316977b3d0d37761520e (diff) | |
parent | cc19246f5804c8ca4a71cb66ed233422337c031c (diff) | |
download | mariadb-git-0eb21ee474dbca7c638f1142e3317c34ca86611f.tar.gz |
Merge mysql.com:/home/hf/work/w3475/my50-w3475
into mysql.com:/home/hf/work/w3475/my51-w3475
client/mysqltest.c:
Auto merged
BitKeeper/deleted/.del-bdb-deadlock.test:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/t/lock_multi.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
mysql-test/t/status.test:
Auto merged
mysql-test/include/deadlock.inc:
SCCS merged
Diffstat (limited to 'mysql-test/t/status.test')
-rw-r--r-- | mysql-test/t/status.test | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/mysql-test/t/status.test b/mysql-test/t/status.test index 2afcd49962c..099c2e062bb 100644 --- a/mysql-test/t/status.test +++ b/mysql-test/t/status.test @@ -1,10 +1,3 @@ -# This test doesn't work with the embedded version as this code -# assumes that one query is running while we are doing queries on -# a second connection. -# This would work if mysqltest run would be threaded and handle each -# connection in a separate thread. -# ---source include/not_embedded.inc # PS causes different statistics --disable_ps_protocol |