diff options
| author | unknown <andrey@lmy004.> | 2006-01-10 21:02:19 +0100 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-01-10 21:02:19 +0100 |
| commit | bb0b7f5dda0933e60cd9520d172fd27a9724cdb6 (patch) | |
| tree | ed7905772f33cdc3e24dd8fbfa8894d09ed4ec0a /sql/sql_lex.cc | |
| parent | 12c8b61aad80d04c99d77ef2a92fc26393b4f68d (diff) | |
| parent | 1ef97f1f3b3dc53a5945fb4fc7db6a3fea926379 (diff) | |
| download | mariadb-git-bb0b7f5dda0933e60cd9520d172fd27a9724cdb6.tar.gz | |
WL #1034 (Internal CRON)
merge before push
BUILD/SETUP.sh:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
sql/Makefile.am:
Auto merged
sql/lex.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sp.h:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
sql/tztime.cc:
Auto merged
libmysqld/Makefile.am:
manual merge
mysql-test/r/information_schema.result:
manual merge
sql/share/errmsg.txt:
manual merge
sql/sp_head.cc:
manual merge
sql/sql_lex.h:
manual merge
sql/sql_yacc.yy:
manual merge
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index a6892f204a4..0c4e08abe26 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -177,7 +177,9 @@ void lex_start(THD *thd, const uchar *buf, uint length) lex->spcont= NULL; lex->proc_list.first= 0; lex->query_tables_own_last= 0; - lex->escape_used= FALSE; + lex->escape_used= lex->et_compile_phase= FALSE; + + lex->et= NULL; if (lex->sroutines.records) my_hash_reset(&lex->sroutines); |