diff options
| author | Narayanan V <v.narayanan@sun.com> | 2009-04-30 18:22:48 +0530 |
|---|---|---|
| committer | Narayanan V <v.narayanan@sun.com> | 2009-04-30 18:22:48 +0530 |
| commit | bb668b284d76a8c5d740c781cf97139cf47cc6d9 (patch) | |
| tree | 82f0ac09c6dd7029f0785b9b7bad9dc10c0d18e8 /storage/myisam | |
| parent | 765cc53c84a505e9e92abf3d09b018e17dfd4a04 (diff) | |
| parent | db83fda90d704c14770ecaa4f6dd9be9501e834b (diff) | |
| download | mariadb-git-bb668b284d76a8c5d740c781cf97139cf47cc6d9.tar.gz | |
merging with mysql-5.1-bugteam
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/ha_myisam.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index b98b090d021..e82246638ff 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -414,7 +414,7 @@ int check_definition(MI_KEYDEF *t1_keyinfo, MI_COLUMNDEF *t1_recinfo, test(t2_keyinfo[i].flag & HA_SPATIAL))); DBUG_RETURN(1); } - if ((mysql_40_compat && + if ((!mysql_40_compat && t1_keyinfo[i].key_alg != t2_keyinfo[i].key_alg) || t1_keyinfo[i].keysegs != t2_keyinfo[i].keysegs) { @@ -446,7 +446,7 @@ int check_definition(MI_KEYDEF *t1_keyinfo, MI_COLUMNDEF *t1_recinfo, t1_keysegs_j__type= HA_KEYTYPE_VARBINARY1; /* purecov: inspected */ } - if ((mysql_40_compat && + if ((!mysql_40_compat && t1_keysegs[j].language != t2_keysegs[j].language) || t1_keysegs_j__type != t2_keysegs[j].type || t1_keysegs[j].null_bit != t2_keysegs[j].null_bit || |