SQL: removed CLI option --versioning-asof-timestamp

MariaDB · Nov 13, 2017 · b76787b · b76787b
1 parent 0d3b8ed
commit b76787b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 30 deletions.
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
@@ -9450,29 +9450,6 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument)
               WSREP_SYNC_WAIT_BEFORE_READ);
     break;
 #endif /* WITH_WSREP */
-  case OPT_VERS_ASOF_TIMESTAMP:
-    int type= find_type(argument, opt->typelib, FIND_TYPE_BASIC);
-    st_vers_asof_timestamp &out= global_system_variables.vers_asof_timestamp;
-    if (type)
-    {
-      out.type= type - 1;
-      DBUG_ASSERT(out.type < FOR_SYSTEM_TIME_AS_OF);
-    }
-    else
-    {
-      out.type= FOR_SYSTEM_TIME_AS_OF;
-      MYSQL_TIME_STATUS status;
-      bool err= str_to_datetime(argument, strlen(argument), &out.ltime, 0, &status);
-      if (err || (status.warnings & ~MYSQL_TIME_NOTE_TRUNCATED))
-      {
-        sql_print_error("Can't start server: "
-                        "cannot process --%s=%.*s",
-                        opt->name,
-                        FN_REFLEN, argument);
-        return 1;
-      }
-    }
-    break;
   }
   return 0;
 }

diff --git a/sql/mysqld.h b/sql/mysqld.h
@@ -193,15 +193,11 @@ enum vers_range_type_t
 
 struct st_vers_asof_timestamp
 {
-  const char *getopt_value;
   ulong type;
   MYSQL_TIME ltime;
   st_vers_asof_timestamp() :
-    getopt_value(NULL),
     type(FOR_SYSTEM_TIME_UNSPECIFIED)
-  {
-    DBUG_ASSERT((void *)this == &this->getopt_value);
-  }
+  {}
 };
 
 enum vers_hide_enum
@@ -701,7 +697,6 @@ enum options_mysqld
   OPT_SSL_KEY,
   OPT_THREAD_CONCURRENCY,
   OPT_WANT_CORE,
-  OPT_VERS_ASOF_TIMESTAMP,
 #ifdef WITH_WSREP
   OPT_WSREP_CAUSAL_READS,
   OPT_WSREP_SYNC_WAIT,

diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
@@ -390,7 +390,7 @@ static Sys_var_charptr Sys_my_bind_addr(
 const char *Sys_var_vers_asof::asof_keywords[]= {"CURRENT", "ALL", NULL};
 static Sys_var_vers_asof Sys_vers_asof_timestamp(
        "versioning_asof_timestamp", "Default AS OF value for versioned queries",
-       SESSION_VAR(vers_asof_timestamp.getopt_value), CMD_LINE(REQUIRED_ARG, OPT_VERS_ASOF_TIMESTAMP),
+       SESSION_VAR(vers_asof_timestamp.type), NO_CMD_LINE,
        Sys_var_vers_asof::asof_keywords, DEFAULT(FOR_SYSTEM_TIME_UNSPECIFIED));
 
 static Sys_var_mybool Sys_vers_force(