diff options
author | unknown <bell@sanja.is.com.ua> | 2004-02-09 14:47:41 +0200 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2004-02-09 14:47:41 +0200 |
commit | 8302f040b7314c0b6b4e28ead2394cdb4d0e8d5d (patch) | |
tree | 7becaf2ef2ba2bf3f53d6afad2278b7aaeda40e0 /sql/sql_lex.h | |
parent | 61f0e69cb60b9db858bad3b6de6fa0b8b2f03899 (diff) | |
parent | 33e2cd7bdbd0d10703471f7ddaf8b02a7adc89cf (diff) | |
download | mariadb-git-8302f040b7314c0b6b4e28ead2394cdb4d0e8d5d.tar.gz |
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-derived2-4.1/
into sanja.is.com.ua:/home/bell/mysql/bk/work-prepared-4.1
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r-- | sql/sql_lex.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 3b1b3873706..8c4b9850e0a 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -354,6 +354,7 @@ public: int prepare(THD *thd, select_result *result, ulong additional_options); int exec(); int cleanup(); + void reinit_exec_mechanism(); bool check_updateable(char *db, char *table); void print(String *str); |