MDEV-14404 Don't use LEX::check_exists in ALTER SEQUENCE

MariaDB · Nov 15, 2017 · 1c34608 · 1c34608
1 parent 7663773
commit 1c34608
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/sql/sql_alter.h b/sql/sql_alter.h
@@ -387,13 +387,15 @@ class Sql_cmd_alter_table : public Sql_cmd_common_alter_table
 /**
   Sql_cmd_alter_sequence represents the ALTER SEQUENCE statement.
 */
-class Sql_cmd_alter_sequence : public Sql_cmd
+class Sql_cmd_alter_sequence : public Sql_cmd,
+                               public DDL_options
 {
 public:
   /**
     Constructor, used to represent a ALTER TABLE statement.
   */
-  Sql_cmd_alter_sequence()
+  Sql_cmd_alter_sequence(const DDL_options &options)
+   :DDL_options(options)
   {}
 
   ~Sql_cmd_alter_sequence()

diff --git a/sql/sql_sequence.cc b/sql/sql_sequence.cc
@@ -851,10 +851,10 @@ bool Sql_cmd_alter_sequence::execute(THD *thd)
   if (check_grant(thd, ALTER_ACL, first_table, FALSE, UINT_MAX, FALSE))
     DBUG_RETURN(TRUE);                  /* purecov: inspected */
 
-  if (lex->check_exists)
+  if (if_exists())
     thd->push_internal_handler(&no_such_table_handler);
   error= open_and_lock_tables(thd, first_table, FALSE, 0);
-  if (lex->check_exists)
+  if (if_exists())
   {
     trapped_errors= no_such_table_handler.safely_trapped_errors();
     thd->pop_internal_handler();

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
@@ -7314,7 +7314,7 @@ alter:
             Lex->create_info.set($2);
             Lex->sql_command= SQLCOM_ALTER_USER;
           }
-        | ALTER SEQUENCE_SYM opt_if_exists_table_element
+        | ALTER SEQUENCE_SYM opt_if_exists
           {
             LEX *lex= Lex;
             lex->name= null_clex_str;
@@ -7337,7 +7337,7 @@ alter:
           sequence_defs
           {
             /* Create a generic ALTER SEQUENCE statment. */
-            Lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_alter_sequence();
+            Lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_alter_sequence($3);
             if (Lex->m_sql_cmd == NULL)
               MYSQL_YYABORT;
           }

diff --git a/sql/sql_yacc_ora.yy b/sql/sql_yacc_ora.yy
@@ -7301,7 +7301,7 @@ alter:
             Lex->create_info.set($2);
             Lex->sql_command= SQLCOM_ALTER_USER;
           }
-        | ALTER SEQUENCE_SYM opt_if_exists_table_element
+        | ALTER SEQUENCE_SYM opt_if_exists
           {
             LEX *lex= Lex;
             lex->name= null_clex_str;
@@ -7324,7 +7324,7 @@ alter:
           sequence_defs
           {
             /* Create a generic ALTER SEQUENCE statment. */
-            Lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_alter_sequence();
+            Lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_alter_sequence($3);
             if (Lex->m_sql_cmd == NULL)
               MYSQL_YYABORT;
           }