summaryrefslogtreecommitdiff
path: root/sql/sql_connect.cc
diff options
context:
space:
mode:
authorunknown <tsmith@ramayana.hindu.god>2007-08-27 14:31:27 -0600
committerunknown <tsmith@ramayana.hindu.god>2007-08-27 14:31:27 -0600
commit61e988e712ed82542ebc1d867a21e71f3103a0f7 (patch)
tree679a96401bec41e2c195429ae868169f2520ef9b /sql/sql_connect.cc
parentad4ee2067349fa7e6d3810b4fe05692cf9b19acf (diff)
downloadmariadb-git-61e988e712ed82542ebc1d867a21e71f3103a0f7.tar.gz
Bug #30389: connection_id() always return 0 in embedded server
Initialize thd->variables.pseudo_thread_id when a new embedded thd is created. libmysqld/lib_sql.cc: Add comment regarding duplication of code in create_embedded_thd() vs. create_new_thread() and prepare_new_connection_state(). This was a cause for not properly initializing the pseudo_thread_id variable. mysql-test/r/func_misc.result: Add test case to ensure connection_id() returns a sane value mysql-test/t/func_misc.test: Add test case to ensure connection_id() returns a sane value sql/mysqld.cc: Add comment warning of the duplication of code between create_new_thread() and create_embedded_thd() sql/sql_connect.cc: Add comment warning of the duplication of code between prepare_new_connection_state() and create_embedded_thd()
Diffstat (limited to 'sql/sql_connect.cc')
-rw-r--r--sql/sql_connect.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc
index 03b9908c1ad..6bb0f62d843 100644
--- a/sql/sql_connect.cc
+++ b/sql/sql_connect.cc
@@ -1008,6 +1008,11 @@ void prepare_new_connection_state(THD* thd)
if (thd->client_capabilities & CLIENT_COMPRESS)
thd->net.compress=1; // Use compression
+ /*
+ Much of this is duplicated in create_embedded_thd() for the
+ embedded server library.
+ TODO: refactor this to avoid code duplication there
+ */
thd->version= refresh_version;
thd->proc_info= 0;
thd->command= COM_SLEEP;