bk commit into 5.0 tree (bar:1.1899)

[bar]

Below is the list of changes that have just been committed into a local
5.0 repository of bar. When bar does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1899 05/07/26 16:43:47 bar@stripped +9 -0
  Merge mysql.com:/usr/home/bar/mysql-4.1
  into  mysql.com:/usr/home/bar/mysql-5.0

  strings/ctype-utf8.c
    1.95 05/07/26 16:43:35 bar@stripped +0 -1
    After merge fix

  strings/ctype-ujis.c
    1.67 05/07/26 16:43:05 bar@stripped +0 -5
    after merge fix

  strings/ctype-ucs2.c
    1.53 05/07/26 16:42:30 bar@stripped +0 -4
    after merge fix

  strings/ctype-simple.c
    1.72 05/07/26 16:42:00 bar@stripped +0 -4
    after merge fix

  strings/ctype-mb.c
    1.46 05/07/26 16:41:12 bar@stripped +0 -2
    after merge fix

  strings/ctype-sjis.c
    1.85 05/07/26 16:39:54 bar@stripped +0 -1
    Auto merged

  strings/ctype-gbk.c
    1.75 05/07/26 16:39:54 bar@stripped +0 -0
    Auto merged

  strings/ctype-big5.c
    1.83 05/07/26 16:39:53 bar@stripped +0 -1
    Auto merged

  BitKeeper/deleted/.del-ctype-cp932.c
    1.8 05/07/26 16:39:53 bar@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-ctype-cp932.c
    1.1.5.2 05/07/26 16:39:52 bar@stripped +0 -0
    Merge rename: strings/ctype-cp932.c -> BitKeeper/deleted/.del-ctype-cp932.c

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.0/RESYNC

--- 1.74/strings/ctype-gbk.c	2005-07-22 21:13:01 +05:00
+++ 1.75/strings/ctype-gbk.c	2005-07-26 16:39:54 +05:00
@@ -9969,7 +9969,7 @@
       break;
     }
   }
-  return b - b0;
+  return (uint) (b - b0);
 }
 
 

--- 1.84/strings/ctype-sjis.c	2005-07-20 13:40:10 +05:00
+++ 1.85/strings/ctype-sjis.c	2005-07-26 16:39:54 +05:00
@@ -213,7 +213,7 @@
       uint a_char= sjiscode(*a, *(a+1));
       uint b_char= sjiscode(*b, *(b+1));
       if (a_char != b_char)
-	return a_char - b_char;
+	return (int) a_char - (int) b_char;
       a += 2;
       b += 2;
     } else

--- 1.71/strings/ctype-simple.c	2005-07-20 13:40:10 +05:00
+++ 1.72/strings/ctype-simple.c	2005-07-26 16:42:00 +05:00
@@ -1090,7 +1090,7 @@
     if (*str == '.')
     {
       for(str++ ; str != end && *str == '0' ; str++);
-      return (ulong) (str-str0);
+      return (ulong) (str - str0);
     }
     return 0;
 
@@ -1100,7 +1100,7 @@
       if (!my_isspace(cs,*str))
         break;
     }
-    return (ulong) (str-str0);
+    return (ulong) (str - str0);
   default:
     return 0;
   }
@@ -1117,14 +1117,14 @@
 uint my_numchars_8bit(CHARSET_INFO *cs __attribute__((unused)),
 		      const char *b, const char *e)
 {
-  return (uint) (e-b);
+  return (uint) (e - b);
 }
 
 
 uint my_numcells_8bit(CHARSET_INFO *cs __attribute__((unused)),
 		      const char *b, const char *e)
 {
-  return (uint) (e-b);
+  return (uint) (e - b);
 }