diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-02-17 11:12:55 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-02-17 11:12:55 +0200 |
| commit | 952f99d4c604475217b8f096dc5bab94af8e04db (patch) | |
| tree | 7656414131e3abbff86bae92c090d0209cd07663 /sql/sql_lex.h | |
| parent | 62cc89aad50b00c0ab1ef3e94c5a3467eb78eb70 (diff) | |
| parent | 6826a55b1da73770ce067972efafc00f9d2f6670 (diff) | |
| download | mariadb-git-952f99d4c604475217b8f096dc5bab94af8e04db.tar.gz | |
merge
mysql-test/r/derived.result:
Auto merged
mysql-test/t/derived.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_sum.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 3f56be18c4a..17cccd75697 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -355,6 +355,8 @@ public: int prepare(THD *thd, select_result *result, ulong additional_options); int exec(); int cleanup(); + inline void unclean() { cleaned= 0; } + void reinit_exec_mechanism(); bool check_updateable(char *db, char *table); void print(String *str); |