diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-03-09 13:44:43 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-03-09 13:44:43 +0400 |
| commit | 76542acdcee892dccbc8305d0d13b95d0c57da85 (patch) | |
| tree | 579861827aed01617a37a4f444969b2b8af23f40 | |
| parent | 3cd8b8817d8ce79c5aac9b6074133bc5c294f964 (diff) | |
| parent | 4c0ab891ea2d34a2b6570d19292e4aa426e06b4c (diff) | |
| download | mariadb-git-76542acdcee892dccbc8305d0d13b95d0c57da85.tar.gz | |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/home/hf/work/mrg/mysql-5.0-opt
sql/sql_select.cc:
Auto merged
| -rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 06352d48154..9fe92d63da3 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -7621,7 +7621,8 @@ static COND* substitute_for_best_equal_field(COND *cond, break; } } - if (!((Item_cond*)cond)->argument_list()->elements) + if (cond->type() == Item::COND_ITEM && + !((Item_cond*)cond)->argument_list()->elements) cond= new Item_int((int32)cond->val_bool()); } |