diff options
| author | heikki@hundin.mysql.fi <> | 2002-06-22 20:41:14 +0300 |
|---|---|---|
| committer | heikki@hundin.mysql.fi <> | 2002-06-22 20:41:14 +0300 |
| commit | 128e872f3cc19ec59cb6e07dbb638732797b3f15 (patch) | |
| tree | cd94be28879d52101bd7438dc97dc04856d81739 /innobase/rem | |
| parent | 8056af30e467350a3725c0324bd2142b8fd26801 (diff) | |
| download | mariadb-git-128e872f3cc19ec59cb6e07dbb638732797b3f15.tar.gz | |
Many files:
Merge 3.23.52
Diffstat (limited to 'innobase/rem')
| -rw-r--r-- | innobase/rem/rem0cmp.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/innobase/rem/rem0cmp.c b/innobase/rem/rem0cmp.c index e4779b5f26b..31c76705c4b 100644 --- a/innobase/rem/rem0cmp.c +++ b/innobase/rem/rem0cmp.c @@ -104,7 +104,9 @@ cmp_types_are_equal( 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)) { + || (type1->mtype == DATA_BINARY && type2->mtype == DATA_FIXBINARY) + || (type1->mtype == DATA_MYSQL && type2->mtype == DATA_VARMYSQL) + || (type1->mtype == DATA_VARMYSQL && type2->mtype == DATA_MYSQL)) { return(TRUE); } @@ -124,14 +126,9 @@ cmp_types_are_equal( return(FALSE); } - if (type1->mtype == DATA_MYSQL - || type1->mtype == DATA_VARMYSQL) { + if (type1->mtype == DATA_INT && type1->len != type2->len) { - if ((type1->prtype & ~DATA_NOT_NULL) - != (type2->prtype & ~DATA_NOT_NULL)) { - - return(FALSE); - } + return(FALSE); } return(TRUE); |