diff options
| author | unknown <monty@mishka.local> | 2004-05-16 14:49:32 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2004-05-16 14:49:32 +0300 |
| commit | 8ef62cc1ef3e2b16795fa5fbbc45bcdf422f344c (patch) | |
| tree | 0f57d538c1b4bb04893ef169be6dc7ab73ee1c67 /sql/sql_select.cc | |
| parent | 36bce251128b8fd300c4a6329d0c2d8f601a14bc (diff) | |
| parent | 70f79563d9fa8ef3cdfef01b8eee95ea6e927147 (diff) | |
| download | mariadb-git-8ef62cc1ef3e2b16795fa5fbbc45bcdf422f344c.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.local:/home/my/mysql-4.1
sql/sql_acl.cc:
Auto merged
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 a89ef6b05ea..4325edc3502 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -6160,8 +6160,8 @@ join_read_prev_same(READ_RECORD *info) if ((error=table->file->index_prev(table->record[0]))) return report_error(table, error); - if (key_cmp(table, tab->ref.key_buff, tab->ref.key, - tab->ref.key_length)) + if (key_cmp_if_same(table, tab->ref.key_buff, tab->ref.key, + tab->ref.key_length)) { table->status=STATUS_NOT_FOUND; error= -1; |