diff options
| author | unknown <igor@rurik.mysql.com> | 2005-06-23 11:22:30 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-06-23 11:22:30 -0700 |
| commit | e3cfd4ef0cda7cd46940454ab82f1a509d21cb92 (patch) | |
| tree | 11a7803101cbf7b5a82af191b7a2e86927f5aab1 /sql/item_subselect.cc | |
| parent | 85a7014de65c2475462852d253d9d6331572c107 (diff) | |
| parent | d9a7e4e0dc2abb92f3328104f6b3394c25c355e3 (diff) | |
| download | mariadb-git-e3cfd4ef0cda7cd46940454ab82f1a509d21cb92.tar.gz | |
Manual merge
mysql-test/r/func_str.result:
Auto merged
mysql-test/t/func_str.test:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 393cb87c113..7ea72f3c858 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -1487,7 +1487,7 @@ int subselect_uniquesubquery_engine::exec() TABLE *table= tab->table; for (store_key **copy=tab->ref.key_copy ; *copy ; copy++) { - if (tab->ref.key_err= (*copy)->copy()) + if ((tab->ref.key_err= (*copy)->copy()) & 1) { table->status= STATUS_NOT_FOUND; DBUG_RETURN(1); @@ -1540,7 +1540,7 @@ int subselect_indexsubquery_engine::exec() for (store_key **copy=tab->ref.key_copy ; *copy ; copy++) { - if (tab->ref.key_err= (*copy)->copy()) + if ((tab->ref.key_err= (*copy)->copy()) & 1) { table->status= STATUS_NOT_FOUND; DBUG_RETURN(1); |