Merge 5.0 to 5.1

9da86d45 · msvensson@neptunus.(none) · 4736d8d5 · 9da86d45
Commit 9da86d45 authored May 10, 2006 by msvensson@neptunus.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

sql/sql_show.cc sql/sql_show.cc +3 -0

No files found.
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -938,6 +938,9 @@ store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
                                                     MODE_DB2 |
                                                     MODE_MAXDB |
                                                     MODE_ANSI)) != 0;
+  bool limited_mysql_mode= (thd->variables.sql_mode & (MODE_NO_FIELD_OPTIONS |
+                                                       MODE_MYSQL323 |
+                                                       MODE_MYSQL40)) != 0;
  DBUG_ENTER("store_create_info");
  DBUG_PRINT("enter",("table: %s", table->s->table_name.str));