Merge mysql.com:/home/ram/work/mysql-5.0-maint

into  mysql.com:/home/ram/work/mysql-5.1-maint
parents 2691d9b1 374ff97c
...@@ -469,7 +469,7 @@ static uint pack_keys(uchar *keybuff, uint key_count, KEY *keyinfo, ...@@ -469,7 +469,7 @@ static uint pack_keys(uchar *keybuff, uint key_count, KEY *keyinfo,
int2store(pos+6, key->block_size); int2store(pos+6, key->block_size);
pos+=8; pos+=8;
key_parts+=key->key_parts; key_parts+=key->key_parts;
DBUG_PRINT("loop", ("flags: %d key_parts: %d at 0x%lx", DBUG_PRINT("loop", ("flags: %lu key_parts: %d at 0x%lx",
key->flags, key->key_parts, key->flags, key->key_parts,
(long) key->key_part)); (long) key->key_part));
for (key_part=key->key_part,key_part_end=key_part+key->key_parts ; for (key_part=key->key_part,key_part_end=key_part+key->key_parts ;
......
...@@ -149,7 +149,7 @@ int table2myisam(TABLE *table_arg, MI_KEYDEF **keydef_out, ...@@ -149,7 +149,7 @@ int table2myisam(TABLE *table_arg, MI_KEYDEF **keydef_out,
pos= table_arg->key_info; pos= table_arg->key_info;
for (i= 0; i < share->keys; i++, pos++) for (i= 0; i < share->keys; i++, pos++)
{ {
keydef[i].flag= (pos->flags & (HA_NOSAME | HA_FULLTEXT | HA_SPATIAL)); keydef[i].flag= ((uint16) pos->flags & (HA_NOSAME | HA_FULLTEXT | HA_SPATIAL));
keydef[i].key_alg= pos->algorithm == HA_KEY_ALG_UNDEF ? keydef[i].key_alg= pos->algorithm == HA_KEY_ALG_UNDEF ?
(pos->flags & HA_SPATIAL ? HA_KEY_ALG_RTREE : HA_KEY_ALG_BTREE) : (pos->flags & HA_SPATIAL ? HA_KEY_ALG_RTREE : HA_KEY_ALG_BTREE) :
pos->algorithm; pos->algorithm;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment