bk commit into 5.1 tree (malff:1.2411)

[marc.alff]

Below is the list of changes that have just been committed into a local
5.1 repository of marcsql. When marcsql 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-01-29 08:02:24-07:00, malff@weblab.(none) +2 -0
  Merge malff@stripped:/home/bk/mysql-5.1-runtime
  into  weblab.(none):/home/marcsql/TREE/mysql-5.1-24392
  MERGE: 1.2390.11.1

  mysql-test/t/show_check.test@stripped, 2007-01-29 08:02:19-07:00, malff@weblab.(none) +0 -0
    Auto merged
    MERGE: 1.72.1.1

  sql/sql_yacc.yy@stripped, 2007-01-29 08:02:20-07:00, malff@weblab.(none) +0 -0
    Auto merged
    MERGE: 1.534.1.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	malff
# Host:	weblab.(none)
# Root:	/home/marcsql/TREE/mysql-5.1-24392/RESYNC

--- 1.535/sql/sql_yacc.yy	2007-01-29 08:02:29 -07:00
+++ 1.536/sql/sql_yacc.yy	2007-01-29 08:02:29 -07:00
@@ -54,6 +54,28 @@ const LEX_STRING null_lex_str={0,0};
     YYABORT;				\
   }
 
+/*
+  Work around for broken code generated by bison 1.875.
+
+  The code generated by bison 1.875a and later, bison 2.1 and bison 2.2 is ok.
+  With bison 1.875 however, the generated code contains:
+<pre>
+  yyerrlab1:
+  #if defined (__GNUC_MINOR__) && 2093 <= (__GNUC__ * 1000 + __GNUC_MINOR__)
+    __attribute__ ((__unused__))
+  #endif
+</pre>
+  This usage of __attribute__ is illegal, so we remove it.
+  See the following references for details:
+  http://lists.gnu.org/archive/html/bug-bison/2004-02/msg00014.html
+  http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14273
+*/
+
+#if defined (__GNUC_MINOR__) && 2093 <= (__GNUC__ * 1000 + __GNUC_MINOR__)
+#undef __attribute__
+#define __attribute__(X)
+#endif
+
 /* Helper for parsing "IS [NOT] truth_value" */
 inline Item *is_truth_value(THD *thd, Item *A, bool v1, bool v2)
 {

--- 1.73/mysql-test/t/show_check.test	2007-01-29 08:02:29 -07:00
+++ 1.74/mysql-test/t/show_check.test	2007-01-29 08:02:29 -07:00
@@ -563,4 +563,22 @@ show keys from `mysqlttest\1`.`a\b`;
 drop table `mysqlttest\1`.`a\b`;
 drop database `mysqlttest\1`;
 
+#
+# Bug#24392: SHOW ENGINE MUTEX STATUS is a synonym for SHOW INNODB STATUS
+#
+
+--error ER_UNKNOWN_STORAGE_ENGINE
+show engine foobar status;
+--error ER_UNKNOWN_STORAGE_ENGINE
+show engine foobar logs;
+--error ER_UNKNOWN_STORAGE_ENGINE
+show engine foobar mutex;
+
+--error ER_UNKNOWN_STORAGE_ENGINE
+show engine mutex status;
+
+show engine csv status;
+show engine csv logs;
+show engine csv mutex;
+
 --echo End of 5.1 tests