diff options
| author | monty@mysql.com <> | 2004-08-31 16:53:25 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-08-31 16:53:25 +0300 |
| commit | 7abae83300e2d75ea2a077fee1349915cb366967 (patch) | |
| tree | 517681f3f24bff198f452f95eba935119c9c701d /sql/sql_select.cc | |
| parent | e022b3144e3adb9c12fcfb73110070abbef3e863 (diff) | |
| parent | 6adaff23a4b2170f59dda27cd5b897adb40c2542 (diff) | |
| download | mariadb-git-7abae83300e2d75ea2a077fee1349915cb366967.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
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 4ca8008c518..59c587d876f 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -3220,7 +3220,7 @@ static bool create_ref_for_key(JOIN *join, JOIN_TAB *j, KEYUSE *org_keyuse, store_key **ref_key= j->ref.key_copy; byte *key_buff=j->ref.key_buff, *null_ref_key= 0; - bool keyuse_uses_no_tables= true; + bool keyuse_uses_no_tables= TRUE; if (ftkey) { j->ref.items[0]=((Item_func*)(keyuse->val))->key_item(); @@ -3240,7 +3240,7 @@ static bool create_ref_for_key(JOIN *join, JOIN_TAB *j, KEYUSE *org_keyuse, uint maybe_null= test(keyinfo->key_part[i].null_bit); j->ref.items[i]=keyuse->val; // Save for cond removal - keyuse_uses_no_tables= keyuse_uses_no_tables & !keyuse->used_tables; + keyuse_uses_no_tables= keyuse_uses_no_tables && !keyuse->used_tables; if (!keyuse->used_tables && !(join->select_options & SELECT_DESCRIBE)) { // Compare against constant |