summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2013-03-01 18:09:06 +0200
committerMichael Widenius <monty@askmonty.org>2013-03-01 18:09:06 +0200
commit4cace76d4d3d75cf94762497937479c475d12167 (patch)
tree9c7bad491bb0762dfb460bdd9dc9c58b840a3e49 /sql/mysqld.cc
parent492c3b09d2b3c11ebb043276ff4b245d54d99fd0 (diff)
parent8ed283d882e7147b1caa3f90f708720c94446024 (diff)
downloadmariadb-git-4cace76d4d3d75cf94762497937479c475d12167.tar.gz
Automatic merge
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 872ab8a54ca..d0e0c29a432 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -7298,7 +7298,7 @@ static int mysql_init_variables(void)
log_error_file_ptr= log_error_file;
protocol_version= PROTOCOL_VERSION;
what_to_log= ~ (1L << (uint) COM_TIME);
- refresh_version= 1L; /* Increments on each reload */
+ refresh_version= 2L; /* Increments on each reload. 0 and 1 are reserved */
executed_events= 0;
global_query_id= thread_id= 1L;
my_atomic_rwlock_init(&global_query_id_lock);