diff options
| author | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-11-10 21:39:30 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-11-10 21:39:30 +0400 |
| commit | 170b1aa738ba4ecb9d58a82951bbab6efced1c32 (patch) | |
| tree | 53df478cd973e3a18f9664e42e5642ffd66bac46 /sql | |
| parent | 122bb7e2f7cc544c3bc06a39836a9c3cec855555 (diff) | |
| download | mariadb-git-170b1aa738ba4ecb9d58a82951bbab6efced1c32.tar.gz | |
compiler warnings fixed.
sql/ha_myisam.cc:
compiler warning fixed.
sql/unireg.cc:
compiler warning fixed.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_myisam.cc | 2 | ||||
| -rw-r--r-- | sql/unireg.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index 92fa9e405e1..66f66dccd99 100644 --- a/sql/ha_myisam.cc +++ b/sql/ha_myisam.cc @@ -173,7 +173,7 @@ int table2myisam(TABLE *table_arg, MI_KEYDEF **keydef_out, pos= table_arg->key_info; 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 ? (pos->flags & HA_SPATIAL ? HA_KEY_ALG_RTREE : HA_KEY_ALG_BTREE) : pos->algorithm; diff --git a/sql/unireg.cc b/sql/unireg.cc index d8e63bb78e1..9e6c77d7b62 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -394,7 +394,7 @@ static uint pack_keys(uchar *keybuff, uint key_count, KEY *keyinfo, pos[6]=pos[7]=0; // For the future pos+=8; 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, (long) key->key_part)); for (key_part=key->key_part,key_part_end=key_part+key->key_parts ; |