diff options
| author | unknown <evgen@moonbone.local> | 2006-08-02 16:48:17 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-08-02 16:48:17 +0400 |
| commit | a5812433838540b600aac4689c3a44b44ab9d0be (patch) | |
| tree | 7a13fff7f71bd94f29b3db3ab423eb04d12f5bc8 /mysql-test/t/ps_1general.test | |
| parent | 0825bad93aaeaa64a907250263146adef8187405 (diff) | |
| parent | 504e3756561c92cacb85bf40d42079dcc8eda3d2 (diff) | |
| download | mariadb-git-a5812433838540b600aac4689c3a44b44ab9d0be.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/t/ps_1general.test:
Auto merged
Diffstat (limited to 'mysql-test/t/ps_1general.test')
| -rw-r--r-- | mysql-test/t/ps_1general.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/ps_1general.test b/mysql-test/t/ps_1general.test index 72b69fc8d9f..8d0f9885e80 100644 --- a/mysql-test/t/ps_1general.test +++ b/mysql-test/t/ps_1general.test @@ -316,6 +316,7 @@ prepare stmt4 from ' show table status from test like ''t9%'' '; --replace_column 8 # 12 # 13 # 14 # # Bug#4288 execute stmt4; +--replace_column 2 # prepare stmt4 from ' show status like ''Threads_running'' '; execute stmt4; prepare stmt4 from ' show variables like ''sql_mode'' '; |