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_lex.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_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 4ee66cb1e8d..7d6f21cad05 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -363,6 +363,7 @@ void lex_start(THD *thd) lex->server_options.owner= 0; lex->server_options.port= -1; + lex->is_lex_started= TRUE; DBUG_VOID_RETURN; } @@ -2139,7 +2140,7 @@ void Query_tables_list::destroy_query_tables_list() st_lex::st_lex() :result(0), yacc_yyss(0), yacc_yyvs(0), - sql_command(SQLCOM_END), option_type(OPT_DEFAULT) + sql_command(SQLCOM_END), option_type(OPT_DEFAULT), is_lex_started(0) { my_init_dynamic_array2(&plugins, sizeof(plugin_ref), |