diff options
| author | monty@mysql.com <> | 2005-11-23 22:58:53 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-11-23 22:58:53 +0200 |
| commit | 4575a662cb99b63ec4c790ed00ac6ec09deb7cc3 (patch) | |
| tree | 8972ae3c8dffff8f3b6f27565d191af346c9ac8d /sql/key.cc | |
| parent | 30b360bfccdf9471efb444df0514693f0fb94444 (diff) | |
| parent | e42c98096746bc675e0c6d6b45776937d7cfb05b (diff) | |
| download | mariadb-git-4575a662cb99b63ec4c790ed00ac6ec09deb7cc3.tar.gz | |
Merge mysql.com:/home/my/mysql-5.1
into mysql.com:/home/my/mysql-5.1-TDC
Diffstat (limited to 'sql/key.cc')
| -rw-r--r-- | sql/key.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/key.cc b/sql/key.cc index 5d88ea0a9c3..4001c6177a1 100644 --- a/sql/key.cc +++ b/sql/key.cc @@ -28,7 +28,7 @@ ** Used when calculating key for NEXT_NUMBER */ -int find_ref_key(TABLE *table,Field *field, uint *key_length) +int find_ref_key(KEY *key, uint key_count, Field *field, uint *key_length) { reg2 int i; reg3 KEY *key_info; @@ -38,8 +38,8 @@ int find_ref_key(TABLE *table,Field *field, uint *key_length) /* Test if some key starts as fieldpos */ - for (i= 0, key_info= table->key_info ; - i < (int) table->s->keys ; + for (i= 0, key_info= key ; + i < (int) key_count ; i++, key_info++) { if (key_info->key_part[0].offset == fieldpos) @@ -50,8 +50,8 @@ int find_ref_key(TABLE *table,Field *field, uint *key_length) } /* Test if some key contains fieldpos */ - for (i= 0, key_info= table->key_info ; - i < (int) table->s->keys ; + for (i= 0, key_info= key; + i < (int) key_count ; i++, key_info++) { uint j; |