diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2009-04-30 17:29:57 +0300 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2009-04-30 17:29:57 +0300 |
| commit | 943b90fb05f39a47174b93d9c1547925172c48ff (patch) | |
| tree | cffbf1982dd9e6b95a3a9c93956c328c6b3dbc8c /storage | |
| parent | f683c5e0b6d4093d1e0b210d5b34be237de8e71a (diff) | |
| parent | 767a835b5228c7341f08edc879a0a699f4471aaf (diff) | |
| download | mariadb-git-943b90fb05f39a47174b93d9c1547925172c48ff.tar.gz | |
merge 5.1-bt rep -> local 5.1-bt
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/ibmdb2i/Makefile.am | 1 | ||||
| -rw-r--r-- | storage/myisam/ha_myisam.cc | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/storage/ibmdb2i/Makefile.am b/storage/ibmdb2i/Makefile.am index 2436a764429..768ca15f4cf 100644 --- a/storage/ibmdb2i/Makefile.am +++ b/storage/ibmdb2i/Makefile.am @@ -27,6 +27,7 @@ DEFS = @DEFS@ noinst_HEADERS = ha_ibmdb2i.h db2i_collationSupport.h db2i_file.h \ db2i_ioBuffers.h db2i_blobCollection.h \ db2i_global.h db2i_misc.h db2i_charsetSupport.h db2i_errors.h \ + db2i_iconv.h db2i_myconv.h db2i_safeString.h db2i_sqlStatementStream.h \ db2i_ileBridge.h db2i_validatedPointer.h EXTRA_LTLIBRARIES = ha_ibmdb2i.la 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 || |