SQL: minor cleanup in mysql_alter_table()

397a8915 · Eugene Kosov · Aleksey Midenkov · 1c8a2de7 · 397a8915
Commit 397a8915 authored May 25, 2017 by Eugene Kosov Committed by Aleksey Midenkov May 25, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

sql/sql_table.cc sql/sql_table.cc +4 -6

No files found.
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -9445,13 +9445,11 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
                                 alter_info->keys_onoff,
                                 &alter_ctx))
    {
-      if (versioned && new_versioned && thd->variables.vers_ddl_survival)
+      if (table->versioned_by_sql() && new_versioned &&
+          thd->variables.vers_ddl_survival)
      {
-        if (table->versioned_by_sql())
-        {
-          // Failure of this function may result in corruption of an original table.
-          vers_reset_alter_copy(thd, table);
-        }
+        // Failure of this function may result in corruption of an original table.
+        vers_reset_alter_copy(thd, table);
      }
      goto err_new_table_cleanup;
    }