mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-02 13:15:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mysql.com:/home/my/mysql-5.1

Browse source 
into  mysql.com:/home/my/mysql-5.1-TDC
This commit is contained in:
monty@mysql.com 2005-11-23 22:58:53 +02:00
commit 4575a662cb
100 changed files with 3642 additions and 2106 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sql/key.cc
View file

@ -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;