diff options
| author | konstantin@mysql.com <> | 2004-08-21 02:08:20 +0400 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2004-08-21 02:08:20 +0400 |
| commit | 75454b0a1d97cba06b76c500cff075029b0d3063 (patch) | |
| tree | 03d527868f0af6ab03ac466e054bd64503da4a0e /sql/item_cmpfunc.cc | |
| parent | 325ea1b991b885eb491cc2201cdafbc6b5446f75 (diff) | |
| parent | 568c6e8526bded952225a9f4d2b262582091ae78 (diff) | |
| download | mariadb-git-75454b0a1d97cba06b76c500cff075029b0d3063.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/work/mysql-4.1-4912
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 3c75dba42da..5ad4cf92959 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -589,10 +589,8 @@ bool Item_in_optimizer::fix_left(THD *thd, /* If it is preparation PS only then we do not know values of parameters => cant't get there values and do not need that values. - - TODO: during merge with 5.0 it should be changed on !thd->only_prepare() */ - if (!thd->current_statement) + if (! thd->current_arena->is_stmt_prepare()) cache->store(args[0]); if (cache->cols() == 1) { |