From 9da86d45210cdb65c219047f8b030ef7f3b94043 Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Wed, 10 May 2006 15:54:51 +0200
Subject: [PATCH] Merge 5.0 to 5.1

---
 sql/sql_show.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index f2304864572..5e4324d0003 100644
--- 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));