diff options
| author | unknown <konstantin@mysql.com> | 2004-08-21 02:08:20 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2004-08-21 02:08:20 +0400 |
| commit | 282ec5bd28ba5739f1fe5754e9031646138f3acf (patch) | |
| tree | 03d527868f0af6ab03ac466e054bd64503da4a0e /sql/item_cmpfunc.cc | |
| parent | ae99cc1f6707acd839a1e45edaf69202080411b5 (diff) | |
| parent | 095b686c09f5c143abbfb99839c1d1e2810a5a35 (diff) | |
| download | mariadb-git-282ec5bd28ba5739f1fe5754e9031646138f3acf.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/work/mysql-4.1-4912
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
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) { |