bk commit into 5.1 tree (msvensson:1.2437)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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@stripped, 2007-02-22 16:44:37+01:00, msvensson@stripped +3 -0
  Merge pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum
  into  pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum
  MERGE: 1.1810.2571.1

  extra/Makefile.am@stripped, 2007-02-22 16:43:57+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.30.1.8

  extra/comp_err.c@stripped, 2007-02-22 16:44:35+01:00, msvensson@stripped +0 -120
    Manual merge
    MERGE: 1.23.2.1

  sql/share/errmsg.txt@stripped, 2007-02-22 16:44:17+01:00, msvensson@stripped +0 -540
    Use local errmsg.txt
    MERGE: 1.42.22.1

# 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:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum/RESYNC

--- 1.44/extra/Makefile.am	2006-12-31 01:06:32 +01:00
+++ 1.45/extra/Makefile.am	2007-02-22 16:43:57 +01:00
@@ -16,7 +16,8 @@
 INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_srcdir)/sql
 LDADD =			@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \
-			../dbug/libdbug.a ../strings/libmystrings.a
+			../dbug/libdbug.a ../strings/libmystrings.a \
+			$(ZLIB_LIBS)
 BUILT_SOURCES=		$(top_builddir)/include/mysqld_error.h \
                         $(top_builddir)/include/sql_state.h \
                         $(top_builddir)/include/mysqld_ername.h

--- 1.27/extra/comp_err.c	2007-02-14 19:34:04 +01:00
+++ 1.28/extra/comp_err.c	2007-02-22 16:44:35 +01:00
@@ -637,27 +637,26 @@
 {
   char chksum= 0;
   const char* p= msg;
-  int is_format_specifier= 0;
+  const char* start= 0;
   int num_format_specifiers= 0;
   while (*p)
   {
 
     if (*p == '%')
     {
-      is_format_specifier= 1; /* Entering format specifier */
+      start= p+1; /* Entering format specifier */
       num_format_specifiers++;
     }
-
-    if (is_format_specifier)
+    else if (start)
     {
-      chksum^= *p;
       switch(*p)
       {
       case 'd':
       case 'u':
       case 'x':
       case 's':
-        is_format_specifier= 0; /* Not in format specifier anymore */
+        chksum= my_checksum(chksum, start, p-start);
+        start= 0; /* Not in format specifier anymore */
         break;
 
       default:
@@ -668,13 +667,13 @@
     p++;
   }
 
-  if (is_format_specifier)
+  if (start)
   {
     /* Still inside a format specifier after end of string */
 
     fprintf(stderr, "Still inside formatspecifier after end of string"
                     " in'%s'\n", msg);
-    DBUG_ASSERT(is_format_specifier==0);
+    DBUG_ASSERT(start==0);
   }
 
   /* Add number of format specifiers to checksum as extra safeguard */