diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-06-07 13:37:11 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-06-07 13:37:11 +0300 |
| commit | c444c4f56f33c4a03b7bdebea642ae2b9878cf59 (patch) | |
| tree | cfc7680310d6f385a7a68a83610f51ff12d9f4e8 /sql/sys_vars.cc | |
| parent | f29d24b0f88b67504bc701b6f2773a0109ad6154 (diff) | |
| parent | e1e3293da56324c3efff25ed79d87ccf6c8fb2d8 (diff) | |
| download | mariadb-git-c444c4f56f33c4a03b7bdebea642ae2b9878cf59.tar.gz | |
merge and typo fix
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 34a9401a41e..0a692089798 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -2405,8 +2405,8 @@ static Sys_var_session_special Sys_timestamp( "timestamp", "Set the time for this client", sys_var::ONLY_SESSION, NO_CMD_LINE, VALID_RANGE(0, ~(time_t)0), BLOCK_SIZE(1), - NO_MUTEX_GUARD, IN_BINLOG, ON_CHECK(0), ON_UPDATE(update_timestamp), - ON_READ(read_timestamp)); + NO_MUTEX_GUARD, IN_BINLOG, ON_CHECK(check_timestamp), + ON_UPDATE(update_timestamp), ON_READ(read_timestamp)); static bool update_last_insert_id(THD *thd, set_var *var) { |