diff options
| author | unknown <igor@rurik.mysql.com> | 2005-06-28 03:20:00 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-06-28 03:20:00 -0700 |
| commit | 27478af9d562f8c0269004344da0a52be0bd4359 (patch) | |
| tree | aafa9caa64c34f34454ad3eb07a43d81a6cf8d4a /sql/item_subselect.cc | |
| parent | 2776aa35b7abc4c0f742eaa94c04b4072e2ba83d (diff) | |
| parent | 3f499c32d44005906ad08c34011fbe96c598230a (diff) | |
| download | mariadb-git-27478af9d562f8c0269004344da0a52be0bd4359.tar.gz | |
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
sql/field.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 ebc08545566..82954a664c0 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -1361,7 +1361,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); @@ -1414,7 +1414,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); |