bk commit into 5.0 tree (serg:1.2107)

[serg]

Below is the list of changes that have just been committed into a local
5.0 repository of mysqldev. When mysqldev 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.2107 06/05/24 14:22:36 serg@stripped +6 -0
  Merge mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release
  into  mysql.com:/data0/mysqldev/my/mysql-5.0.22-release

  extra/comp_err.c
    1.23 06/05/24 14:22:24 serg@stripped +0 -4
    merged

  configure.in
    1.386 06/05/24 14:20:22 serg@stripped +0 -2
    merged

  tests/mysql_client_test.c
    1.182 06/05/24 14:18:08 serg@stripped +0 -0
    Auto merged

  sql/sql_parse.cc
    1.543 06/05/24 14:18:07 serg@stripped +0 -18
    Auto merged

  sql/sql_lex.cc
    1.181 06/05/24 14:18:07 serg@stripped +0 -0
    Auto merged

  scripts/mysqld_multi.sh
    1.30 06/05/24 14:18:07 serg@stripped +0 -0
    Auto merged

# 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:	serg
# Host:	production.mysql.com
# Root:	/data0/mysqldev/my/mysql-5.0.22-release/RESYNC

--- 1.22/extra/comp_err.c	2006-01-03 20:51:16 +01:00
+++ 1.23/extra/comp_err.c	2006-05-24 14:22:24 +02:00
@@ -878,7 +878,7 @@
   print_version();
   printf("This software comes with ABSOLUTELY NO WARRANTY. "
          "This is free software,\n"
-         "and you are welcome to modify and redistribute it under the GPL license\n"
+         "and you are welcome to modify and redistribute it under the GPL license.\n"
          "Usage:\n");
   my_print_help(my_long_options);
   my_print_variables(my_long_options);

--- 1.180/sql/sql_lex.cc	2006-03-10 01:44:01 +01:00
+++ 1.181/sql/sql_lex.cc	2006-05-24 14:18:07 +02:00
@@ -307,18 +307,7 @@
       found_escape=1;
       if (lex->ptr == lex->end_of_query)
 	return 0;
-#ifdef USE_MB
-      int l;
-      if (use_mb(cs) &&
-          (l = my_ismbchar(cs,
-                           (const char *)lex->ptr,
-                           (const char *)lex->end_of_query))) {
-          lex->ptr += l;
-          continue;
-      }
-      else
-#endif
-        yySkip();
+      yySkip();
     }
     else if (c == sep)
     {
@@ -347,9 +336,6 @@
       {
 	uchar *to;
 
-        /* Re-use found_escape for tracking state of escapes */
-        found_escape= 0;
-
 	for (to=start ; str != end ; str++)
 	{
 #ifdef USE_MB
@@ -363,8 +349,7 @@
 	      continue;
 	  }
 #endif
-	  if (!found_escape &&
-              !(lex->thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) &&
+	  if (!(lex->thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) &&
               *str == '\\' && str+1 != end)
 	  {
 	    switch(*++str) {
@@ -391,20 +376,14 @@
 	      *to++= '\\';		// remember prefix for wildcard
 	      /* Fall through */
 	    default:
-              found_escape= 1;
-              str--;
+              *to++= *str;
 	      break;
 	    }
 	  }
-	  else if (!found_escape && *str == sep)
-          {
-            found_escape= 1;
-          }
+	  else if (*str == sep)
+	    *to++= *str++;		// Two ' or "
 	  else
-          {
 	    *to++ = *str;
-            found_escape= 0;
-          }
 	}
 	*to=0;
 	lex->yytoklen=(uint) (to-start);

--- 1.181/tests/mysql_client_test.c	2006-03-30 20:35:46 +02:00
+++ 1.182/tests/mysql_client_test.c	2006-05-24 14:18:08 +02:00
@@ -12794,25 +12794,26 @@
 static void test_bug8378()
 {
 #if defined(HAVE_CHARSET_gbk) && !defined(EMBEDDED_LIBRARY)
-  MYSQL *lmysql;
+  MYSQL *old_mysql=mysql;
   char out[9]; /* strlen(TEST_BUG8378)*2+1 */
-  int len;
+  char buf[256];
+  int len, rc;
 
   myheader("test_bug8378");
 
   if (!opt_silent)
     fprintf(stdout, "\n Establishing a test connection ...");
-  if (!(lmysql= mysql_init(NULL)))
+  if (!(mysql= mysql_init(NULL)))
   {
     myerror("mysql_init() failed");
     exit(1);
   }
-  if (mysql_options(lmysql, MYSQL_SET_CHARSET_NAME, "gbk"))
+  if (mysql_options(mysql, MYSQL_SET_CHARSET_NAME, "gbk"))
   {
     myerror("mysql_options() failed");
     exit(1);
   }
-  if (!(mysql_real_connect(lmysql, opt_host, opt_user,
+  if (!(mysql_real_connect(mysql, opt_host, opt_user,
                            opt_password, current_db, opt_port,
                            opt_unix_socket, 0)))
   {
@@ -12822,12 +12823,18 @@
   if (!opt_silent)
     fprintf(stdout, " OK");
 
-  len= mysql_real_escape_string(lmysql, out, TEST_BUG8378_IN, 4);
+  len= mysql_real_escape_string(mysql, out, TEST_BUG8378_IN, 4);
 
   /* No escaping should have actually happened. */
   DIE_UNLESS(memcmp(out, TEST_BUG8378_OUT, len) == 0);
 
-  mysql_close(lmysql);
+  sprintf(buf, "SELECT '%s'", out);
+  rc=mysql_real_query(mysql, buf, strlen(buf));
+  myquery(rc);
+
+  mysql_close(mysql);
+
+  mysql=old_mysql;
 #endif
 }