Merge mysql.com:/home/jwinstead2/mysql-4.1-clean

into mysql.com:/home/jwinstead2/mysql-5.0-clean


libmysql_r/Makefile.am:
  Auto merged
mysql-test/r/analyse.result:
  Auto merged
sql/sql_analyse.cc:
  Auto merged

libmysql_r/Makefile.am

@@ -22,7 +22,7 @@
 
 target = libmysqlclient_r.la
 target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@
-LIBS = @LIBS@ @openssl_libs@
+LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@
 
 INCLUDES = @MT_INCLUDES@ \
 	   -I$(top_srcdir)/include $(openssl_includes) @ZLIB_INCLUDES@ \

mysql-test/r/analyse.result

@@ -96,3 +96,9 @@ select * from t2;
 Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype
 test.t1.a	1	2	1	1	0	0	1.5000	0.5000	ENUM('1','2') NOT NULL
 drop table t1,t2;
+create table t1 (v varchar(128));
+insert into t1 values ('abc'),('abc\'def\\hij\"klm\0opq'),('\''),('\"'),('\\'),('a\0'),('b\''),('c\"'),('d\\'),('\'b'),('\"c'),('\\d'),('a\0\0\0b'),('a\'\'\'\'b'),('a\"\"\"\"b'),('a\\\\\\\\b'),('\'\0\\\"'),('\'\''),('\"\"'),('\\\\'),('The\ZEnd');
+select * from t1 procedure analyse();
+Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype
+test.t1.v	"	\\	1	19	0	0	3.7619	NULL	ENUM('"','""','"c','\'\0\\"','\'','\'\'','\'b','a\0\0\0b','a\0','a""""b','a\'\'\'\'b','abc','abc\'def\\hij"klm\0opq','a\\\\\\\\b','b\'','c"','d\\','The\ZEnd','\\','\\d','\\\\') NOT NULL
+drop table t1;

mysql-test/t/analyse.test

@@ -38,3 +38,7 @@ select * from t2;
 insert into t2 select * from t1 procedure analyse();
 select * from t2;
 drop table t1,t2;
+create table t1 (v varchar(128));
+insert into t1 values ('abc'),('abc\'def\\hij\"klm\0opq'),('\''),('\"'),('\\'),('a\0'),('b\''),('c\"'),('d\\'),('\'b'),('\"c'),('\\d'),('a\0\0\0b'),('a\'\'\'\'b'),('a\"\"\"\"b'),('a\\\\\\\\b'),('\'\0\\\"'),('\'\''),('\"\"'),('\\\\'),('The\ZEnd');
+select * from t1 procedure analyse();
+drop table t1;

scripts/Makefile.am

@@ -121,6 +121,7 @@ SUFFIXES = .sh
 	  -e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\
 	  -e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
 	  -e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \
+	  -e 's!@''ZLIB_LIBS''@!@ZLIB_LIBS@!' \
 	  -e 's!@''LIBS''@!@LIBS@!' \
 	  -e 's!@''WRAPLIBS''@!@WRAPLIBS@!' \
 	  -e 's!@''innodb_system_libs''@!@innodb_system_libs@!' \

sql/sql_analyse.cc

@@ -59,6 +59,7 @@ int compare_ulonglong2(void* cmp_arg __attribute__((unused)),
   return compare_ulonglong(s,t);
 }
 
+static bool append_escaped(String *to_str, String *from_str);
 
 Procedure *
 proc_analyse_init(THD *thd, ORDER *param, select_result *result,
@@ -890,7 +891,8 @@ int collect_string(String *element,
   else
     info->found = 1;
   info->str->append('\'');
-  info->str->append(*element);
+  if (append_escaped(info->str, element))
+    return 1;
   info->str->append('\'');
   return 0;
 } // collect_string
@@ -1025,3 +1027,58 @@ uint check_ulonglong(const char *str, uint length)
   while (*cmp && *cmp++ == *str++) ;
   return ((uchar) str[-1] <= (uchar) cmp[-1]) ? smaller : bigger;
 } /* check_ulonlong */
+
+
+
+/*
+  FUNCTION: append_escaped()
+ 
+  DESCRIPTION
+    append_escaped() takes a String type variable, where it appends
+    escaped the second argument. Only characters that require escaping
+    will be escaped.
+
+  ARGUMENTS
+    A pointer to a String variable, where results will be appended
+    A pointer to a String variable, which is appended to the result
+    String, escaping those characters that require it.
+
+  RETURN VALUES
+    0 Success
+    1 Out of memory
+*/
+
+static bool append_escaped(String *to_str, String *from_str)
+{
+  char *from, *end, c;
+
+  if (to_str->realloc(to_str->length() + from_str->length()))
+    return 1;
+
+  from= (char*) from_str->ptr();
+  end= from + from_str->length();
+  for (; from < end; from++)
+  {
+    c= *from;
+    switch (c) {
+    case '\0':
+      c= '0';
+      break;
+    case '\032':
+      c= 'Z';
+      break;
+    case '\\':
+    case '\'':
+      break;
+    default:
+      goto normal_character;
+    }
+    if (to_str->append('\\'))
+      return 1;
+
+  normal_character:
+    if (to_str->append(c))
+      return 1;
+  }
+  return 0;
+}