diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-01-13 15:04:57 +0200 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-01-13 15:04:57 +0200 |
| commit | bcb3783c7c88b06a8417a5734103ae856a2f7dbc (patch) | |
| tree | d10c1a3e5dfb10f8dfdc803f3caf980c93100c5b /mysql-test | |
| parent | 81a082075f3ca8d581a4194e3c4b7a3e9a439e3d (diff) | |
| download | mariadb-git-bcb3783c7c88b06a8417a5734103ae856a2f7dbc.tar.gz | |
Fixed a problem with a test. Time could be 0 or 1 seconds, depending
on whether running with or without valgrind.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/ps_1general.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/ps_1general.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result index 25b9e2dcda4..ee3eca850f4 100644 --- a/mysql-test/r/ps_1general.result +++ b/mysql-test/r/ps_1general.result @@ -291,7 +291,7 @@ execute stmt4; prepare stmt4 from ' show full processlist '; execute stmt4; Id User Host db Command Time State Info -number root localhost test Query 0 NULL show full processlist +number root localhost test Query time NULL show full processlist prepare stmt4 from ' show grants for user '; prepare stmt4 from ' show create table t2 '; ERROR HY000: This command is not supported in the prepared statement protocol yet diff --git a/mysql-test/t/ps_1general.test b/mysql-test/t/ps_1general.test index 08c1ad85fb1..d9cc9de6ff1 100644 --- a/mysql-test/t/ps_1general.test +++ b/mysql-test/t/ps_1general.test @@ -317,7 +317,7 @@ prepare stmt4 from ' show engine bdb logs '; execute stmt4; --enable_result_log prepare stmt4 from ' show full processlist '; ---replace_column 1 number +--replace_column 1 number 6 time execute stmt4; prepare stmt4 from ' show grants for user '; --error 1295 |