bk commit into 5.0 tree (schwenke:1.2035) BUG#13926

[axel]

Below is the list of changes that have just been committed into a local
5.0 repository of schwenke. When schwenke 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.2035 05/10/11 22:57:24 schwenke@stripped +1 -0
  fix for bug #13926

  client/mysqldump.c
    1.204 05/10/11 22:57:06 schwenke@stripped +4 -4
    quote the column names delivered by primary_key_fields to avoid syntax error when a PK
column contains special character(s)

# 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:	schwenke
# Host:	lmy003.xl.local
# Root:	/home/schwenke/Work/MySQL/bk-internal-tree/mysql-5.0-work

--- 1.203/client/mysqldump.c	2005-09-27 18:40:42 +02:00
+++ 1.204/client/mysqldump.c	2005-10-11 22:57:06 +02:00
@@ -3021,7 +3021,7 @@
 }
 
 /*
-  Get string of comma-separated primary key field names
+  Get string of comma-separated, quoted primary key field names
 
   SYNOPSIS
     char *primary_key_fields(const char *table_name)
@@ -3069,7 +3069,7 @@
   {
     /* Key is unique */
     do
-      result_length += strlen(row[4]) + 1;      /* + 1 for ',' or \0 */
+      result_length += strlen(row[4]) + 3;      /* 2 quotes + 1 for ',' or \0 */
     while ((row = mysql_fetch_row(res)) && atoi(row[3]) > 1);
   }
 
@@ -3086,9 +3086,9 @@
     }
     mysql_data_seek(res, 0);
     row = mysql_fetch_row(res);
-    end = strmov(result, row[4]);
+    end = strxmov(result, "`", row[4], "`", NullS);
     while ((row = mysql_fetch_row(res)) && atoi(row[3]) > 1)
-      end = strxmov(end, ",", row[4], NullS);
+      end = strxmov(end, ",`", row[4], "`", NullS);
   }
 
 cleanup: