diff options
| author | unknown <istruewing@stella.local> | 2008-03-11 11:30:30 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2008-03-11 11:30:30 +0100 |
| commit | 28eb7e60d50795d110d4fe2d6477acdeb4c725d5 (patch) | |
| tree | b7cec0a7b9e0917d9c8c4d5e1030af03f02ae424 /storage | |
| parent | 1bffc51066b2a79f03e4177f8103e5cc2320ca67 (diff) | |
| parent | 06db9c0ef593def964b7fb7e6c22401f7f4a5026 (diff) | |
| download | mariadb-git-28eb7e60d50795d110d4fe2d6477acdeb4c725d5.tar.gz | |
Merge stella.local:/home2/mydev/mysql-5.1-ateam
into stella.local:/home2/mydev/mysql-5.1-axmrg
Diffstat (limited to 'storage')
| -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 4486d317ae0..9c04a5a3523 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -410,10 +410,10 @@ int check_definition(MI_KEYDEF *t1_keyinfo, MI_COLUMNDEF *t1_recinfo, { if ((t1_keysegs_j__type == HA_KEYTYPE_VARTEXT2) && (t2_keysegs[j].type == HA_KEYTYPE_VARTEXT1)) - t1_keysegs_j__type= HA_KEYTYPE_VARTEXT1; + t1_keysegs_j__type= HA_KEYTYPE_VARTEXT1; /* purecov: tested */ else if ((t1_keysegs_j__type == HA_KEYTYPE_VARBINARY2) && (t2_keysegs[j].type == HA_KEYTYPE_VARBINARY1)) - t1_keysegs_j__type= HA_KEYTYPE_VARBINARY1; + t1_keysegs_j__type= HA_KEYTYPE_VARBINARY1; /* purecov: inspected */ } if (t1_keysegs_j__type != t2_keysegs[j].type || |