From 128e872f3cc19ec59cb6e07dbb638732797b3f15 Mon Sep 17 00:00:00 2001
From: "heikki@hundin.mysql.fi" <>
Date: Sat, 22 Jun 2002 20:41:14 +0300
Subject: Many files:   Merge 3.23.52

---
 innobase/rem/rem0cmp.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'innobase/rem/rem0cmp.c')

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);
-- 
cgit v1.2.1