diff options
author | unknown <igreenhoe/greenman@anubis.greendragongames.com> | 2006-07-13 16:35:25 -0700 |
---|---|---|
committer | unknown <igreenhoe/greenman@anubis.greendragongames.com> | 2006-07-13 16:35:25 -0700 |
commit | 35bfad1e3db9d955a135035d4af6665f0331e811 (patch) | |
tree | ade4a3fc40348d0802ec1bbd31d554eaa91edfd3 /sql/sql_prepare.cc | |
parent | 316577d69537d49d359a1928c6f54194aef19620 (diff) | |
parent | 3c2bdb59bc19a62f08e9b778649d9f12a9c87eab (diff) | |
download | mariadb-git-35bfad1e3db9d955a135035d4af6665f0331e811.tar.gz |
4.1 -> 5.0 merge
client/mysql.cc:
Auto merged
client/sql_string.h:
Auto merged
configure.in:
Auto merged
myisam/mi_create.c:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_string.h:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/sql_prepare.cc')
-rw-r--r-- | sql/sql_prepare.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 103a0b9e54e..ffe54310843 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2135,7 +2135,8 @@ void reinit_stmt_before_use(THD *thd, LEX *lex) Reset old pointers to TABLEs: they are not valid since the tables were closed in the end of previous prepare or execute call. */ - tables->table= 0; + tables->reinit_before_use(thd); + /* Reset is_schema_table_processed value(needed for I_S tables */ tables->is_schema_table_processed= FALSE; |