diff options
| author | unknown <kostja@bodhi.local> | 2006-10-23 12:06:59 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-10-23 12:06:59 +0400 |
| commit | efcd6b42b44ce178a779924c1e960cde3d9a4246 (patch) | |
| tree | 48398b537ee608f80f6d1155dea687ca9d0e8239 /sql/sql_lex.cc | |
| parent | 9852dfbcf5d3bfb5eec4316977b3d0d37761520e (diff) | |
| parent | d76cf9973a9d8fdff1d815597a611e3cae2cf646 (diff) | |
| download | mariadb-git-efcd6b42b44ce178a779924c1e960cde3d9a4246.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
mysql-test/r/ps.result:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/r/view.result:
Manual merge.
mysql-test/t/view.test:
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 dd358492d0d..2aa7e1c11c4 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -151,7 +151,6 @@ void lex_start(THD *thd, const 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; |