diff options
| author | Luis Soares <luis.soares@sun.com> | 2009-11-13 10:17:53 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2009-11-13 10:17:53 +0000 |
| commit | d8ca6b9dd9111db8f303d872f279f374af68e80b (patch) | |
| tree | 5107afeb0f71e17a7fcdff3685ea606313d1aa3c /mysql-test/t/show_check.test | |
| parent | 0d46e5880e0bb00183b93dedfb8fb007f46dc36e (diff) | |
| parent | 7cf9ee96ae496654ac912080f9b7a64f2950e938 (diff) | |
| download | mariadb-git-d8ca6b9dd9111db8f303d872f279f374af68e80b.tar.gz | |
manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)
CONFLICTS
=========
Text conflict in sql/sql_yacc.yy
1 conflicts encountered.
Diffstat (limited to 'mysql-test/t/show_check.test')
| -rw-r--r-- | mysql-test/t/show_check.test | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test index 0ce807ae73e..9a984a0b8c9 100644 --- a/mysql-test/t/show_check.test +++ b/mysql-test/t/show_check.test @@ -630,7 +630,6 @@ show columns in t1; show slave hosts; show keys in t1; show column types; -show table types; show storage engines; show authors; show contributors; @@ -1009,11 +1008,6 @@ disconnect con4; # --disable_result_log -show full plugin; ---enable_result_log -show warnings; ---disable_result_log -show plugin; show plugins; --enable_result_log @@ -1181,14 +1175,6 @@ DROP TABLE t1; DROP EVENT ev1; # -# Bug#30036 SHOW TABLE TYPES causes the debug client to crash -# ---disable_result_log -SHOW TABLE TYPES; ---enable_result_log - - -# # Bug#32710 SHOW INNODB STATUS requires SUPER # |