diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-04-11 08:18:21 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-04 09:06:00 +0200 |
| commit | 69da361ccdac3c0dd6233527ee983687e966fd20 (patch) | |
| tree | 5dd77fbeefd37605d2d748dc33b5b2fa32c3b51d /sql/sql_class.cc | |
| parent | 4aacb20dce3374bd3d6dcac9be5f5a53da8488b1 (diff) | |
| download | mariadb-git-69da361ccdac3c0dd6233527ee983687e966fd20.tar.gz | |
reset @@TIMESTAMP for COM_CHANGE_USER
this also fixes tokudb.type_year failure
(in ./mtr tokudb.type_timestamp tokudb.type_year)
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index c8347d0f585..f460d318791 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -945,7 +945,6 @@ THD::THD(my_thread_id id, bool is_wsrep_applier) statement_id_counter= 0UL; // Must be reset to handle error with THD's created for init of mysqld lex->current_select= 0; - user_time.val= start_time= start_time_sec_part= 0; start_utime= utime_after_query= 0; utime_after_lock= 0L; progress.arena= 0; @@ -1399,6 +1398,8 @@ void THD::init(void) mysql_mutex_unlock(&LOCK_global_system_variables); + user_time.val= start_time= start_time_sec_part= 0; + server_status= SERVER_STATUS_AUTOCOMMIT; if (variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) server_status|= SERVER_STATUS_NO_BACKSLASH_ESCAPES; |