summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/set_var.cc3
-rw-r--r--sql/set_var.h12
-rw-r--r--sql/sql_parse.cc2
-rw-r--r--sql/sys_vars.cc21
-rw-r--r--sql/sys_vars.h45
5 files changed, 41 insertions, 42 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 278a05213a6..c65ca3d59b7 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -147,7 +147,7 @@ sys_var::sys_var(sys_var_chain *chain, const char *name_arg,
flags(flags_arg), show_val_type(show_val_type_arg),
guard(lock), offset(off), on_check(on_check_func), on_update(on_update_func),
deprecation_substitute(substitute),
- is_os_charset(FALSE), default_val(FALSE)
+ is_os_charset(FALSE)
{
/*
There is a limitation in handle_options() related to short options:
@@ -790,7 +790,6 @@ int set_var::light_check(THD *thd)
*/
int set_var::update(THD *thd)
{
- var->set_is_default(value == 0);
return value ? var->update(thd, this) : var->set_default(thd, this);
}
diff --git a/sql/set_var.h b/sql/set_var.h
index 15c89f1e2b4..0215a452c07 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -88,7 +88,6 @@ protected:
on_update_function on_update;
const char *const deprecation_substitute;
bool is_os_charset; ///< true if the value is in character_set_filesystem
- bool default_val;
public:
sys_var(sys_var_chain *chain, const char *name_arg, const char *comment,
@@ -194,8 +193,15 @@ public:
return insert_dynamic(array, (uchar*)&option);
}
void do_deprecated_warning(THD *thd);
- bool is_default() { return default_val; }
- void set_is_default(bool def) { default_val= def; }
+ /**
+ whether session value of a sysvar is a default one.
+
+ in this simple implementation we don't distinguish between default
+ and non-default values. for most variables it's ok, they don't treat
+ default values specially. this method is overwritten in descendant
+ classes as necessary.
+ */
+ virtual bool session_is_default(THD *thd) { return false; }
virtual uchar *default_value_ptr(THD *thd)
{ return (uchar*)&option.def_value; }
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 3109b2ffe86..5eca972def3 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2663,7 +2663,7 @@ mysql_execute_command(THD *thd)
lex->free_arena_for_set_stmt();
goto error;
}
- if (v->var->is_default())
+ if (v->var->session_is_default(thd))
o= new set_var(v->type, v->var, &v->base, NULL);
else
{
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index 32935f3404e..cc29762c144 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -3708,28 +3708,11 @@ static Sys_var_harows Sys_select_limit(
SESSION_VAR(select_limit), NO_CMD_LINE,
VALID_RANGE(0, HA_POS_ERROR), DEFAULT(HA_POS_ERROR), BLOCK_SIZE(1));
-static bool update_timestamp(THD *thd, set_var *var)
-{
- if (var->value)
- {
- my_hrtime_t hrtime = { hrtime_from_time(var->save_result.double_value) };
- thd->set_time(hrtime);
- }
- else // SET timestamp=DEFAULT
- thd->user_time.val= 0;
- return false;
-}
-static double read_timestamp(THD *thd)
-{
- return thd->start_time +
- thd->start_time_sec_part/(double)TIME_SECOND_PART_FACTOR;
-}
-static Sys_var_session_special_double Sys_timestamp(
+static Sys_var_timestamp Sys_timestamp(
"timestamp", "Set the time for this client",
sys_var::ONLY_SESSION, NO_CMD_LINE,
VALID_RANGE(0, TIMESTAMP_MAX_VALUE),
- NO_MUTEX_GUARD, IN_BINLOG, ON_CHECK(0),
- ON_UPDATE(update_timestamp), ON_READ(read_timestamp));
+ NO_MUTEX_GUARD, IN_BINLOG);
static bool update_last_insert_id(THD *thd, set_var *var)
{
diff --git a/sql/sys_vars.h b/sql/sys_vars.h
index 2b83e9747b7..7c0359a7427 100644
--- a/sql/sys_vars.h
+++ b/sql/sys_vars.h
@@ -1657,46 +1657,57 @@ public:
};
-class Sys_var_session_special_double: public Sys_var_double
-{
- typedef bool (*session_special_update_function)(THD *thd, set_var *var);
- typedef double (*session_special_read_function)(THD *thd);
+/*
+ Dedicated class because of a weird behavior of a default value.
+ Assigning timestamp to itself
- session_special_read_function read_func;
- session_special_update_function update_func;
+ SET @@timestamp = @@timestamp
+
+ make it non-default and stops the time flow.
+*/
+class Sys_var_timestamp: public Sys_var_double
+{
public:
- Sys_var_session_special_double(const char *name_arg,
+ Sys_var_timestamp(const char *name_arg,
const char *comment, int flag_args,
CMD_LINE getopt,
double min_val, double max_val,
- PolyLock *lock, enum binlog_status_enum binlog_status_arg,
- on_check_function on_check_func,
- session_special_update_function update_func_arg,
- session_special_read_function read_func_arg,
- const char *substitute=0)
+ PolyLock *lock, enum binlog_status_enum binlog_status_arg)
: Sys_var_double(name_arg, comment, flag_args, 0,
sizeof(double), getopt, min_val,
- max_val, 0, lock, binlog_status_arg, on_check_func, 0,
- substitute),
- read_func(read_func_arg), update_func(update_func_arg)
+ max_val, 0, lock, binlog_status_arg)
{
SYSVAR_ASSERT(scope() == ONLY_SESSION);
SYSVAR_ASSERT(getopt.id < 0); // NO_CMD_LINE, because the offset is fake
}
bool session_update(THD *thd, set_var *var)
- { return update_func(thd, var); }
+ {
+ if (var->value)
+ {
+ my_hrtime_t hrtime = { hrtime_from_time(var->save_result.double_value) };
+ thd->set_time(hrtime);
+ }
+ else // SET timestamp=DEFAULT
+ thd->user_time.val= 0;
+ return false;
+ }
bool global_update(THD *thd, set_var *var)
{
DBUG_ASSERT(FALSE);
return true;
}
+ bool session_is_default(THD *thd)
+ {
+ return thd->user_time.val == 0;
+ }
void session_save_default(THD *thd, set_var *var)
{ var->value= 0; }
void global_save_default(THD *thd, set_var *var)
{ DBUG_ASSERT(FALSE); }
uchar *session_value_ptr(THD *thd, const LEX_STRING *base)
{
- thd->sys_var_tmp.double_value= read_func(thd);
+ thd->sys_var_tmp.double_value= thd->start_time +
+ thd->start_time_sec_part/(double)TIME_SECOND_PART_FACTOR;
return (uchar*) &thd->sys_var_tmp.double_value;
}
uchar *global_value_ptr(THD *thd, const LEX_STRING *base)
View Lorry Controller Status