summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2016-02-26 14:55:20 +0400
committerSergey Vojtovich <svoj@mariadb.org>2016-02-26 14:55:20 +0400
commited990465779add258ebe8a486279cf615449d640 (patch)
tree6a5175c3c410bb54d22862e5973a1a9a35cb05a1
parent804fb401bab830c2a8099225e445867365ec5859 (diff)
downloadmariadb-git-ed990465779add258ebe8a486279cf615449d640.tar.gz
Fixed change_user and func_misc in embedded
First thread was getting id 0, while it is intended to get id 1.
-rw-r--r--sql/mysqld.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index bd456bbe85e..b4502f6ddbf 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -555,7 +555,7 @@ ulong max_prepared_stmt_count;
statements.
*/
ulong prepared_stmt_count=0;
-my_thread_id global_thread_id= 0;
+my_thread_id global_thread_id= 1;
ulong current_pid;
ulong slow_launch_threads = 0;
uint sync_binlog_period= 0, sync_relaylog_period= 0,
@@ -8744,7 +8744,7 @@ static int mysql_init_variables(void)
denied_connections= 0;
executed_events= 0;
global_query_id= 1;
- global_thread_id= 0;
+ global_thread_id= 1;
strnmov(server_version, MYSQL_SERVER_VERSION, sizeof(server_version)-1);
threads.empty();
thread_cache.empty();