summaryrefslogtreecommitdiff
path: root/innobase/rem
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2002-02-11 13:48:59 +0200
committermonty@hundin.mysql.fi <>2002-02-11 13:48:59 +0200
commit4abd402b87def3f292f77b4091493675d9a37589 (patch)
treeada172b5dc5dccd546e301548aac618812e19814 /innobase/rem
parent28670e4757fd33f8dead2902154e486cfc67fd27 (diff)
parent1efcc3e35ea8323f592b7b752f0822293650eeb1 (diff)
downloadmariadb-git-4abd402b87def3f292f77b4091493675d9a37589.tar.gz
merge with 3.23.48
Diffstat (limited to 'innobase/rem')
-rw-r--r--innobase/rem/rem0cmp.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/innobase/rem/rem0cmp.c b/innobase/rem/rem0cmp.c
index 47b7021bf27..9a5a0eb6e8e 100644
--- a/innobase/rem/rem0cmp.c
+++ b/innobase/rem/rem0cmp.c
@@ -113,6 +113,16 @@ cmp_types_are_equal(
return(FALSE);
}
+ if (type1->mtype == DATA_INT
+ && (type1->prtype & DATA_UNSIGNED)
+ != (type2->prtype & DATA_UNSIGNED)) {
+ /* The storage format of an unsigned integer is different
+ from a signed integer: in a signed integer we OR
+ 0x8000... to the value of positive integers. */
+
+ return(FALSE);
+ }
+
if (type1->mtype == DATA_MYSQL
|| type1->mtype == DATA_VARMYSQL) {