diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-10-12 18:33:07 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-10-12 18:33:07 +0400 |
| commit | 649f3d54795941a7bff31b022afab7cedcf23201 (patch) | |
| tree | 6e60423957874c3ac45f9febaa246e6f0fb32e73 /sql/sql_lex.cc | |
| parent | 82db5471062e75e43e7bc032dc088e45fe5cbcf5 (diff) | |
| parent | 6d1fdc7308d73c439d7a2da6851199939cde93f4 (diff) | |
| download | mariadb-git-649f3d54795941a7bff31b022afab7cedcf23201.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20953
mysql-test/r/view.result:
Auto merged
mysql-test/t/sp-error.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/sp-error.result:
Manual merge.
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 788276ac654..405f576ac04 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -150,7 +150,6 @@ void lex_start(THD *thd, uchar *buf,uint length) lex->safe_to_cache_query= 1; lex->time_zone_tables_used= 0; lex->leaf_tables_insert= 0; - lex->variables_used= 0; lex->empty_field_list_on_rset= 0; lex->select_lex.select_number= 1; lex->next_state=MY_LEX_START; |