summaryrefslogtreecommitdiff
path: root/sql/sql_connect.cc
diff options
context:
space:
mode:
authorunknown <istruewing@stella.local>2007-11-10 11:58:41 +0100
committerunknown <istruewing@stella.local>2007-11-10 11:58:41 +0100
commit4b1e7b75b137ce2a56eaf4a071bd16ecfb6f89a2 (patch)
tree7f2bedb38da74996d31783831b1b37adb8a50f36 /sql/sql_connect.cc
parent6cc90dbb2231865839a5d00090e5f89c889e14a2 (diff)
parente5b2745efc9451081c56b7a6b2f4cdfcc6dfb280 (diff)
downloadmariadb-git-4b1e7b75b137ce2a56eaf4a071bd16ecfb6f89a2.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into stella.local:/home2/mydev/mysql-5.1-bug31210 sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_connect.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_servers.cc: Auto merged sql/sql_udf.cc: Auto merged sql/table.cc: Auto merged
Diffstat (limited to 'sql/sql_connect.cc')
-rw-r--r--sql/sql_connect.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc
index 094bef9324e..25531872ccd 100644
--- a/sql/sql_connect.cc
+++ b/sql/sql_connect.cc
@@ -1095,6 +1095,7 @@ pthread_handler_t handle_one_connection(void *arg)
{
NET *net= &thd->net;
+ lex_start(thd);
if (login_connection(thd))
goto end_thread;