diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-05-07 13:05:09 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-05-07 13:05:09 +0200 |
commit | b381cf843c841151f96541b19bd753cd3bbae326 (patch) | |
tree | dfc377a1dfbd4d2044a0b799ff5ed6411c7e864f /mysql-test/t/mysqlshow.test | |
parent | d4be9e7bc0cfd5ddd444ecc64daa4166597ca2eb (diff) | |
parent | e5055e22f1f311fa48457cfcc97b72e93a37329f (diff) | |
download | mariadb-git-b381cf843c841151f96541b19bd753cd3bbae326.tar.gz |
mysql-5.5.31 merge
Diffstat (limited to 'mysql-test/t/mysqlshow.test')
-rw-r--r-- | mysql-test/t/mysqlshow.test | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/mysql-test/t/mysqlshow.test b/mysql-test/t/mysqlshow.test index cf8661d090c..4602c15e566 100644 --- a/mysql-test/t/mysqlshow.test +++ b/mysql-test/t/mysqlshow.test @@ -29,17 +29,14 @@ select "---- -v -v -t ------" as ""; DROP TABLE t1, t2; -if (`select count(*) from information_schema.plugins where plugin_name='innodb' and plugin_auth_version > "5.5.31"`) -{ # because of lp:1066512 this test shows xtradb I_S plugins, even when # xtradb is supposed to be disabled # # Bug #19147: mysqlshow INFORMATION_SCHEMA does not work # ---exec $MYSQL_SHOW information_schema ---exec $MYSQL_SHOW INFORMATION_SCHEMA ---exec $MYSQL_SHOW inf_rmation_schema -} +#--exec $MYSQL_SHOW information_schema +#--exec $MYSQL_SHOW INFORMATION_SCHEMA +#--exec $MYSQL_SHOW inf_rmation_schema --echo End of 5.0 tests |