diff options
| author | unknown <konstantin@mysql.com> | 2004-08-21 02:08:20 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2004-08-21 02:08:20 +0400 |
| commit | 282ec5bd28ba5739f1fe5754e9031646138f3acf (patch) | |
| tree | 03d527868f0af6ab03ac466e054bd64503da4a0e /sql/sql_parse.cc | |
| parent | ae99cc1f6707acd839a1e45edaf69202080411b5 (diff) | |
| parent | 095b686c09f5c143abbfb99839c1d1e2810a5a35 (diff) | |
| download | mariadb-git-282ec5bd28ba5739f1fe5754e9031646138f3acf.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/work/mysql-4.1-4912
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 309d96c3c8e..66eebba74c9 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1543,6 +1543,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, break; mysqld_list_fields(thd,&table_list,fields); free_items(thd->free_list); + thd->free_list= 0; break; } #endif @@ -4047,6 +4048,7 @@ void mysql_parse(THD *thd, char *inBuf, uint length) } thd->proc_info="freeing items"; free_items(thd->free_list); /* Free strings used by items */ + thd->free_list= 0; lex_end(lex); } DBUG_VOID_RETURN; @@ -4073,6 +4075,7 @@ bool mysql_test_parse_for_slave(THD *thd, char *inBuf, uint length) all_tables_not_ok(thd,(TABLE_LIST*) lex->select_lex.table_list.first)) error= 1; /* Ignore question */ free_items(thd->free_list); /* Free strings used by items */ + thd->free_list= 0; lex_end(lex); return error; |