diff options
| author | monty@hundin.mysql.fi <> | 2002-01-02 21:34:12 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-01-02 21:34:12 +0200 |
| commit | fd0459a521f832eb6d6106d8f813a1a798b1676e (patch) | |
| tree | 8dbf52f0dc71a962692f98d1363958acf5d8fd67 /innobase/rem | |
| parent | 4b877e0088e6f32a606ffaa0fb3c94afb0b24388 (diff) | |
| parent | 89f8ca058e3c548fa23b7a4aeb5662425d3d83b0 (diff) | |
| download | mariadb-git-fd0459a521f832eb6d6106d8f813a1a798b1676e.tar.gz | |
merge with 3.23
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); } |