diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-08-28 20:38:08 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-08-28 20:38:08 +0300 |
| commit | 82ace8f8205626d7a94ff8cb9c3da9b8bb2752db (patch) | |
| tree | 5567e0cd839d61d46c7842bae8460db495f7e324 /sql/sql_select.cc | |
| parent | 0f57bb2eda7b76f7a5e8bb34b6f01084d84ab6d1 (diff) | |
| parent | 834cfbd190649b97f1c017ad107a6a335d335cb3 (diff) | |
| download | mariadb-git-82ace8f8205626d7a94ff8cb9c3da9b8bb2752db.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-enum-4.1
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 37454d93b6d..de6b2ce443f 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -324,8 +324,8 @@ JOIN::prepare(Item ***rref_pointer_array, { Item_subselect::trans_res res; if ((res= subselect->select_transformer(this)) != - Item_subselect::OK) - DBUG_RETURN((res == Item_subselect::ERROR)); + Item_subselect::RES_OK) + DBUG_RETURN((res == Item_subselect::RES_ERROR)); } } |