maintain behavior introduced in fix for MySQL bug 35765

(avert regression)

maintain behavior introduced in fix for MySQL bug 35765
(avert regression)
00dad1c0 · Tatjana Azundris Nuernberg · 0619bd57 · 00dad1c0
Commit 00dad1c0 authored Aug 11, 2011 by Tatjana Azundris Nuernberg
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

sql/sql_yacc.yy sql/sql_yacc.yy +6 -2

No files found.
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -5036,8 +5036,7 @@ create_table_option:
          ENGINE_SYM opt_equal storage_engines
          {
            Lex->create_info.db_type= $3;
-            if ($3)
+            Lex->create_info.used_fields|= HA_CREATE_USED_ENGINE;
-              Lex->create_info.used_fields|= HA_CREATE_USED_ENGINE;
          }
        | MAX_ROWS opt_equal ulonglong_num
          {
@@ -6748,6 +6747,11 @@ alter_list_item:
          {
            LEX *lex=Lex;
            lex->alter_info.flags|= ALTER_OPTIONS;
+            if ((lex->create_info.used_fields & HA_CREATE_USED_ENGINE) &&
+                !lex->create_info.db_type)
+            {
+              lex->create_info.used_fields&= ~HA_CREATE_USED_ENGINE;
+            }
          }
        | FORCE_SYM
          {