diff options
| author | unknown <istruewing@stella.local> | 2007-11-10 11:58:41 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2007-11-10 11:58:41 +0100 |
| commit | 4b1e7b75b137ce2a56eaf4a071bd16ecfb6f89a2 (patch) | |
| tree | 7f2bedb38da74996d31783831b1b37adb8a50f36 /sql/sql_servers.cc | |
| parent | 6cc90dbb2231865839a5d00090e5f89c889e14a2 (diff) | |
| parent | e5b2745efc9451081c56b7a6b2f4cdfcc6dfb280 (diff) | |
| download | mariadb-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_servers.cc')
| -rw-r--r-- | sql/sql_servers.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_servers.cc b/sql/sql_servers.cc index 543884fdfa6..602c289a605 100644 --- a/sql/sql_servers.cc +++ b/sql/sql_servers.cc @@ -140,6 +140,7 @@ bool servers_init(bool dont_read_servers_table) DBUG_RETURN(TRUE); thd->thread_stack= (char*) &thd; thd->store_globals(); + lex_start(thd); /* It is safe to call servers_reload() since servers_* arrays and hashes which will be freed there are global static objects and thus are initialized |