From c53184ebb775290d2e0f8397815832f1c84a8a5c Mon Sep 17 00:00:00 2001
From: unknown <monty@mysql.com>
Date: Tue, 1 Feb 2005 16:27:08 +0200
Subject: Proper fix for comparision with ' ' (Bug #7788 "Table is full" occurs
 during a multitable update")

client/mysqldump.c:
  Style fixes
innobase/include/univ.i:
  UNIV_DEBUG should not depend on configure --debug but on --debug=full
mysql-test/r/compare.result:
  Added test to find bug in previous bugfix
mysql-test/t/compare.test:
  Added test to find bug in previous bugfix
mysys/my_handler.c:
  Proper fix for comparision with ' '
strings/ctype-big5.c:
  Proper fix for comparision with ' '
strings/ctype-bin.c:
  Proper fix for comparision with ' '
strings/ctype-gbk.c:
  Proper fix for comparision with ' '
strings/ctype-latin1.c:
  Proper fix for comparision with ' '
strings/ctype-mb.c:
  Proper fix for comparision with ' '
strings/ctype-simple.c:
  Proper fix for comparision with ' '
strings/ctype-sjis.c:
  Proper fix for comparision with ' '
strings/ctype-tis620.c:
  Proper fix for comparision with ' '
strings/ctype-ucs2.c:
  Proper fix for comparision with ' '
strings/ctype-utf8.c:
  Proper fix for comparision with ' '
---
 mysys/my_handler.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'mysys/my_handler.c')

diff --git a/mysys/my_handler.c b/mysys/my_handler.c
index df1e9e55e0a..5ee181ca78e 100644
--- a/mysys/my_handler.c
+++ b/mysys/my_handler.c
@@ -43,7 +43,7 @@ static int compare_bin(uchar *a, uint a_length, uchar *b, uint b_length,
     return 0;
   if (skip_end_space && a_length != b_length)
   {
-    int swap= 0;
+    int swap= 1;
     /*
       We are using space compression. We have to check if longer key
       has next character < ' ', in which case it's less than the shorter
@@ -57,12 +57,12 @@ static int compare_bin(uchar *a, uint a_length, uchar *b, uint b_length,
       /* put shorter key in a */
       a_length= b_length;
       a= b;
-      swap= -1 ^ 1;					/* swap sign of result */
+      swap= -1;					/* swap sign of result */
     }
     for (end= a + a_length-length; a < end ; a++)
     {
       if (*a != ' ')
-	return ((int) *a - (int) ' ') ^ swap;
+	return (*a < ' ') ? -swap : swap;
     }
     return 0;
   }
-- 
cgit v1.2.1