bk commit into 5.1 tree (petr:1.1916)

[Petr Chardin]

Below is the list of changes that have just been committed into a local
5.1 repository of cps. When cps 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.1916 05/10/07 01:14:34 petr@stripped +6 -0
  Merge mysql.com:/home/cps/mysql/trees/mysql-5.0
  into  mysql.com:/home/cps/mysql/trees/mysql-5.1-fix-csv

  strings/ctype-ucs2.c
    1.55 05/10/07 01:14:20 petr@stripped +0 -0
    Auto merged

  strings/ctype-big5.c
    1.86 05/10/07 01:14:20 petr@stripped +0 -0
    Auto merged

  storage/innobase/os/os0sync.c
    1.27 05/10/07 01:14:20 petr@stripped +0 -0
    Auto merged

  sql/log.cc
    1.172 05/10/07 01:14:20 petr@stripped +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.231 05/10/07 01:14:20 petr@stripped +0 -0
    Auto merged

  storage/innobase/os/os0sync.c
    1.24.3.2 05/10/07 01:14:19 petr@stripped +0 -0
    Merge rename: innobase/os/os0sync.c -> storage/innobase/os/os0sync.c

  BUILD/SETUP.sh
    1.47 05/10/07 01:14:19 petr@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:	petr
# Host:	owlet.
# Root:	/home/cps/mysql/trees/mysql-5.1-fix-csv/RESYNC

--- 1.171/sql/log.cc	2005-10-06 12:25:59 +04:00
+++ 1.172/sql/log.cc	2005-10-07 01:14:20 +04:00
@@ -67,7 +67,7 @@
   NULL,                         /* rollback_by_xid */
   NULL,                         /* create_cursor_read_view */
   NULL,                         /* set_cursor_read_view */
-  NULL,    			/* close_cursor_read_view */
+  NULL,                         /* close_cursor_read_view */
   HTON_NO_FLAGS
 };
 
@@ -79,7 +79,7 @@
 
 bool binlog_init()
 {
-  return false;
+  return !opt_bin_log;
 }
 
 static int binlog_close_connection(THD *thd)

--- 1.85/strings/ctype-big5.c	2005-08-25 20:49:48 +04:00
+++ 1.86/strings/ctype-big5.c	2005-10-07 01:14:20 +04:00
@@ -401,16 +401,12 @@
 				  uint res_length, char *min_str,char *max_str,
 				  uint *min_length,uint *max_length)
 {
-  const char *end;
+  const char *end= ptr + ptr_length;
   char *min_org=min_str;
   char *min_end=min_str+res_length;
-  uint charlen= my_charpos(cs, ptr, ptr+ptr_length, res_length/cs->mbmaxlen);
+  uint charlen= res_length / cs->mbmaxlen;
 
-  if (charlen < ptr_length)
-    ptr_length= charlen;
-  end= ptr + ptr_length;
-
-  for (; ptr != end && min_str != min_end ; ptr++)
+  for (; ptr != end && min_str != min_end && charlen > 0; ptr++, charlen--)
   {
     if (ptr+1 != end && isbig5code(ptr[0],ptr[1]))
     {
@@ -421,7 +417,10 @@
     if (*ptr == escape && ptr+1 != end)
     {
       ptr++;				/* Skip escape */
-      *min_str++= *max_str++ = *ptr;
+      if (isbig5code(ptr[0], ptr[1]))
+        *min_str++= *max_str++ = *ptr++;
+      if (min_str < min_end)
+        *min_str++= *max_str++= *ptr;
       continue;
     }
     if (*ptr == w_one)			/* '_' in SQL */

--- 1.54/strings/ctype-ucs2.c	2005-08-25 20:49:48 +04:00
+++ 1.55/strings/ctype-ucs2.c	2005-10-07 01:14:20 +04:00
@@ -1450,10 +1450,12 @@
   const char *end=ptr+ptr_length;
   char *min_org=min_str;
   char *min_end=min_str+res_length;
+  uint charlen= res_length / cs->mbmaxlen;
   
-  for (; ptr + 1 < end && min_str + 1 < min_end ; ptr+=2)
+  for ( ; ptr + 1 < end && min_str + 1 < min_end && charlen > 0
+        ; ptr+=2, charlen--)
   {
-    if (ptr[0] == '\0' && ptr[1] == escape && ptr+2 < end)
+    if (ptr[0] == '\0' && ptr[1] == escape && ptr + 1 < end)
     {
       ptr+=2;					/* Skip escape */
       *min_str++= *max_str++ = ptr[0];

--- 1.230/sql/ha_innodb.cc	2005-10-06 12:25:58 +04:00
+++ 1.231/sql/ha_innodb.cc	2005-10-07 01:14:20 +04:00
@@ -5772,7 +5772,8 @@
 		fclose(file);
 	} else {
 		/* unable to create temporary file */
-          	str = my_malloc(1, MYF(MY_ZEROFILL));
+          	str = my_strdup(
+"/* Error: cannot display foreign key constraints */", MYF(0));
 	}
 
   	return(str);