summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-04-09 11:14:57 +0200
committerSergei Golubchik <serg@mariadb.org>2015-04-09 19:41:59 +0200
commiteb29a63e4508359a44a29c192fae347196d5a6d3 (patch)
treeb81e5632a8c8193b8bebbea594f286157f37ece0 /sql/sql_parse.cc
parent0a9052f591a04e617ad58ee1b19dfc3ed7084147 (diff)
downloadmariadb-git-eb29a63e4508359a44a29c192fae347196d5a6d3.tar.gz
SET STATEMENT timestamp=xxx ....
fix sys_var->is_default() method (that was using default_val property in a global sys_var object to track per-session state): * move timestamp to a dedicated Sys_var_timestamp class (in fact, rename Sys_var_session_special_double to Sys_var_timestamp) * make session_is_default a virtual method with a special implementation for timestamps * other variables don't have a special behavior for default values and can have session_is_default() to be always false.
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r--sql/sql_parse.cc2
1 files changed, 1 insertions, 1 deletions
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
{