summaryrefslogtreecommitdiff
path: root/sql/sql_connect.cc
diff options
context:
space:
mode:
authorunknown <anozdrin/alik@station.>2007-10-10 17:57:01 +0400
committerunknown <anozdrin/alik@station.>2007-10-10 17:57:01 +0400
commit3b4b925ea7575f8ceed273ff698df28b571cb0aa (patch)
treea626f7589fb237fa37963de0acccf1ec7d936efd /sql/sql_connect.cc
parent45f590d206a7e9c9d7dbaf553096dcbdd303727d (diff)
downloadmariadb-git-3b4b925ea7575f8ceed273ff698df28b571cb0aa.tar.gz
Fix for BUG#20023: mysql_change_user() resets the value
of SQL_BIG_SELECTS. The bug was that SQL_BIG_SELECTS was not properly set in COM_CHANGE_USER. The fix is to update SQL_BIG_SELECTS properly. sql/mysql_priv.h: Cleanup: make prepare_new_connection_state() private for module. sql/sql_class.cc: Update THD::options with the respect to SQL_BIG_SELECTS in COM_CHANGE_USER. sql/sql_connect.cc: Cleanup: make prepare_new_connection_state() private for module. tests/mysql_client_test.c: Add a test case BUG#20023.
Diffstat (limited to 'sql/sql_connect.cc')
-rw-r--r--sql/sql_connect.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc
index 9785b30ea00..094bef9324e 100644
--- a/sql/sql_connect.cc
+++ b/sql/sql_connect.cc
@@ -933,7 +933,7 @@ bool login_connection(THD *thd)
NET *net= &thd->net;
Security_context *sctx= thd->security_ctx;
DBUG_ENTER("login_connection");
- DBUG_PRINT("info", ("handle_one_connection called by thread %lu",
+ DBUG_PRINT("info", ("login_connection called by thread %lu",
thd->thread_id));
net->no_send_error= 0;
@@ -1003,7 +1003,7 @@ void end_connection(THD *thd)
Initialize THD to handle queries
*/
-void prepare_new_connection_state(THD* thd)
+static void prepare_new_connection_state(THD* thd)
{
Security_context *sctx= thd->security_ctx;