diff options
| author | unknown <kostja@bodhi.local> | 2006-07-11 21:19:57 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-07-11 21:19:57 +0400 |
| commit | d8b447a1b6c4f4f5d2a335eef6b5f4ac4f2f267b (patch) | |
| tree | 282cc5a8f5fb6720588ef04e63fad742387f33e9 /sql/table.h | |
| parent | 67d53e36cdbcc4cdf5dc785a5f465c1e1bc7fdbe (diff) | |
| parent | 4cb0659de2b9d434cfe92b48b409dadee62fa7df (diff) | |
| download | mariadb-git-d8b447a1b6c4f4f5d2a335eef6b5f4ac4f2f267b.tar.gz | |
Merge bodhi.local:/opt/local/work/tmp_merge
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/ps.result:
Manual merge: use local.
mysql-test/t/ps.test:
Manual merge: remove duplicate test cases from ps.test.
sql/sql_lex.cc:
Manual merge.
sql/sql_prepare.cc:
Manual merge.
sql/table.h:
Manual merge.
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/table.h b/sql/table.h index d23d58e964f..88a1482907c 100644 --- a/sql/table.h +++ b/sql/table.h @@ -672,6 +672,11 @@ typedef struct st_table_list private: bool prep_check_option(THD *thd, uint8 check_opt_type); bool prep_where(THD *thd, Item **conds, bool no_where_clause); + /* + Cleanup for re-execution in a prepared statement or a stored + procedure. + */ + void reinit_before_use(THD *thd); } TABLE_LIST; class Item; |