diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-01-02 21:34:12 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-01-02 21:34:12 +0200 |
| commit | 62c4fa399e0c7acb1e7dfdae4ceac4b61daeb744 (patch) | |
| tree | 8dbf52f0dc71a962692f98d1363958acf5d8fd67 /innobase/rem | |
| parent | f4fee3d90e8456cfd2a4e2f395bd270d0a12c70d (diff) | |
| parent | 38e174cc59f99e8bd55e98d2d427037a5a7719e6 (diff) | |
| download | mariadb-git-62c4fa399e0c7acb1e7dfdae4ceac4b61daeb744.tar.gz | |
merge with 3.23
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
Auto merged
Docs/manual.texi:
Auto merged
client/client_priv.h:
Auto merged
extra/resolveip.c:
Auto merged
innobase/btr/btr0sea.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/rem/rem0cmp.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
mysys/my_bitmap.c:
Auto merged
sql/ha_innobase.cc:
Auto merged
sql/ha_innobase.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_do.cc:
Auto merged
sql/sql_select.cc:
Auto merged
client/mysqldump.c:
Use local version in 4.0
configure.in:
Use 4.0 code
Diffstat (limited to 'innobase/rem')
| -rw-r--r-- | innobase/rem/rem0cmp.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/innobase/rem/rem0cmp.c b/innobase/rem/rem0cmp.c index 1f2987f0182..47b7021bf27 100644 --- a/innobase/rem/rem0cmp.c +++ b/innobase/rem/rem0cmp.c @@ -100,7 +100,15 @@ cmp_types_are_equal( dtype_t* type1, /* in: type 1 */ dtype_t* type2) /* in: type 2 */ { - if (type1->mtype != type2->mtype) { + if ((type1->mtype == DATA_VARCHAR && type2->mtype == DATA_CHAR) + || (type1->mtype == DATA_CHAR && type2->mtype == DATA_VARCHAR) + || (type1->mtype == DATA_FIXBINARY && type2->mtype == DATA_BINARY) + || (type1->mtype == DATA_BINARY && type2->mtype == DATA_FIXBINARY)) { + + return(TRUE); + } + + if (type1->mtype != type2->mtype) { return(FALSE); } |