summaryrefslogtreecommitdiff
path: root/mysql-test/t/ps_1general.test
diff options
context:
space:
mode:
authorunknown <malff/marcsql@weblab.(none)>2007-01-23 15:14:08 -0700
committerunknown <malff/marcsql@weblab.(none)>2007-01-23 15:14:08 -0700
commit186e3ee534024c69fe9aec197dffb0f7dc86da82 (patch)
tree01c7ed4d2173fa714e0ec36c17d94bcc087641f4 /mysql-test/t/ps_1general.test
parenta361cf1b85a69f35577b79a74ec2821fc2d96c2c (diff)
downloadmariadb-git-186e3ee534024c69fe9aec197dffb0f7dc86da82.tar.gz
Bug#24392 (SHOW ENGINE MUTEX STATUS is a synonym for SHOW INNODB STATUS)
Before this fix, the command SHOW ENGINE <name> STATUS would: - print a warning if the engine name is unknown, - proceed and implement the same behavior as SHOW ENGINE ALL STATUS, and list the status of all the storage engines registered. In particular, this behavior caused confusion about the command : SHOW ENGINE MUTEX STATUS, which as a side effect would print the status of the innodb engine when that engine is registered. Also, before this fix, every time an unknown engine name was substituted by the default engine (which happen unless SQL_MODE NO_ENGINE_SUBSTITUTION is set), a malformed warning was raised. For example, the command ALTER TABLE T1 ENGINE = X would print : Warnings: Error 1286 Unknown table engine 'X' With this fix: SHOW ENGINE <name> STATUS|LOGS|MUTEX always fails with an error when the engine <name> is unknown. For other commands, warnings about unknown engines are raised as: Warnings: Warning 1286 Unknown table engine 'X' In other words, engine substitution never affect the SHOW ENGINE command, since this would lead to very confusing results. mysql-test/r/ndb_dd_basic.result: Warnings for unknown engines. mysql-test/r/partition_innodb.result: Warnings for unknown engines. mysql-test/r/ps_1general.result: Fixed SHOW ENGINE <name> STATUS|LOGS|MUTEX mysql-test/r/show_check.result: Fixed SHOW ENGINE <name> STATUS|LOGS|MUTEX mysql-test/t/ps_1general.test: Fixed SHOW ENGINE <name> STATUS|LOGS|MUTEX mysql-test/t/show_check.test: Fixed SHOW ENGINE <name> STATUS|LOGS|MUTEX sql/sql_yacc.yy: Fixed SHOW ENGINE <name> STATUS|LOGS|MUTEX
Diffstat (limited to 'mysql-test/t/ps_1general.test')
-rw-r--r--mysql-test/t/ps_1general.test10
1 files changed, 3 insertions, 7 deletions
diff --git a/mysql-test/t/ps_1general.test b/mysql-test/t/ps_1general.test
index dd70f7edfa7..5b0118ced49 100644
--- a/mysql-test/t/ps_1general.test
+++ b/mysql-test/t/ps_1general.test
@@ -321,14 +321,10 @@ prepare stmt4 from ' show status like ''Threads_running'' ';
execute stmt4;
prepare stmt4 from ' show variables like ''sql_mode'' ';
execute stmt4;
-# The output depends on the bdb being enabled and on the history
-# history (actions of the bdb engine).
-# That is the reason why, we switch the output here off.
-# (The real output will be tested in ps_6bdb.test)
---disable_result_log
+--error ER_UNKNOWN_STORAGE_ENGINE
prepare stmt4 from ' show engine bdb logs ';
-execute stmt4;
---enable_result_log
+--error ER_UNKNOWN_STORAGE_ENGINE
+prepare stmt4 from ' show engine foo logs ';
prepare stmt4 from ' show grants for user ';
prepare stmt4 from ' show create table t2 ';
prepare stmt4 from ' show master status ';