bk commit into 5.1 tree (gkodinov:1.2558) BUG#30036

[kgeorge]

Below is the list of changes that have just been committed into a local
5.1 repository of kgeorge. When kgeorge does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-07-26 18:33:05+03:00, gkodinov@stripped +3 -0
  Bug #30036: SHOW TABLE TYPES causes the debug client to crash
  
  SHOW TABLE TYPES is a (to be deprecated) synonym for 
  SHOW STORAGE ENGINES.
  Fixed to use the right schema table in addition to 
  issuing a warning.

  mysql-test/r/show_check.result@stripped, 2007-07-26 18:33:02+03:00, gkodinov@stripped +1
-0
    Bug #30036: test case

  mysql-test/t/show_check.test@stripped, 2007-07-26 18:33:03+03:00, gkodinov@stripped +8 -0
    Bug #30036: test case

  sql/sql_yacc.yy@stripped, 2007-07-26 18:33:03+03:00, gkodinov@stripped +2 -0
    Bug #30036: use the right schema table

diff -Nrup a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
--- a/mysql-test/r/show_check.result	2007-07-17 22:36:40 +03:00
+++ b/mysql-test/r/show_check.result	2007-07-26 18:33:02 +03:00
@@ -1351,4 +1351,5 @@ DROP PROCEDURE p1;
 DROP FUNCTION f1;
 DROP TABLE t1;
 DROP EVENT ev1;
+SHOW TABLE TYPES;
 End of 5.1 tests
diff -Nrup a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
--- a/mysql-test/t/show_check.test	2007-07-16 16:19:38 +03:00
+++ b/mysql-test/t/show_check.test	2007-07-26 18:33:03 +03:00
@@ -977,4 +977,12 @@ DROP FUNCTION f1;
 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
+
+
 --echo End of 5.1 tests
diff -Nrup a/sql/sql_yacc.yy b/sql/sql_yacc.yy
--- a/sql/sql_yacc.yy	2007-07-17 00:03:56 +03:00
+++ b/sql/sql_yacc.yy	2007-07-26 18:33:03 +03:00
@@ -8729,6 +8729,8 @@ show_param:
 	    LEX *lex=Lex;
 	    lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES;
 	    WARN_DEPRECATED(yythd, "5.2", "SHOW TABLE TYPES", "'SHOW [STORAGE] ENGINES'");
+            if (prepare_schema_table(YYTHD, lex, 0, SCH_ENGINES))
+              MYSQL_YYABORT;
 	  }
 	| opt_storage ENGINES_SYM
 	  {