diff options
| author | monty@mashka.mysql.fi <> | 2002-07-25 22:46:28 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-07-25 22:46:28 +0300 |
| commit | bc035c71f1d94649253e4dac5fb8e5c981c7d834 (patch) | |
| tree | f38c137c73206e3d059517b2bcab6a4a43c957f9 /innobase/rem/rem0cmp.c | |
| parent | b126501bf3888b09fad83dbd2894709c45f009fc (diff) | |
| parent | 3c9f1a9ae47e4fcbede526430b0171e8ba17d948 (diff) | |
| download | mariadb-git-bc035c71f1d94649253e4dac5fb8e5c981c7d834.tar.gz | |
Merge with 3.23.51
Fixed wrong usage of sprintf() in ha_innodb.cc
Diffstat (limited to 'innobase/rem/rem0cmp.c')
| -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 c27af604d04..c50516dfc8b 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); |