bk commit into 4.1 tree (jani:1.2214)

[jani]

Below is the list of changes that have just been committed into a local
4.1 repository of jani. When jani 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2214 05/01/12 22:55:10 jani@stripped +2 -0
  Minor clean up.

  sql/sql_analyse.cc
    1.47 05/01/12 22:54:10 jani@stripped +7 -8
    Changed function description to standard format.

  mysql-test/t/analyse.test
    1.12 05/01/12 22:54:10 jani@stripped +5 -0
    Added a note about the bug that this test case tests.

# 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:	jani
# Host:	a193-229-222-105.elisa-laajakaista.fi
# Root:	/home/my/bk/mysql-4.1

--- 1.46/sql/sql_analyse.cc	Tue Jan 11 19:40:29 2005
+++ 1.47/sql/sql_analyse.cc	Wed Jan 12 22:54:10 2005
@@ -1029,19 +1029,18 @@
 } /* check_ulonlong */
 
 
-
 /*
-  FUNCTION: append_escaped()
- 
+  Quote special characters in a string.
+
+  SYNOPSIS
+   append_escaped(to_str, from_str)
+   to_str (in) A pointer to a String.
+   from_str (to) A pointer to an allocated string
+
   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.11/mysql-test/t/analyse.test	Tue Jan 11 19:40:29 2005
+++ 1.12/mysql-test/t/analyse.test	Wed Jan 12 22:54:10 2005
@@ -38,6 +38,11 @@
 insert into t2 select * from t1 procedure analyse();
 select * from t2;
 drop table t1,t2;
+
+#
+# Bug#2813 - analyse does not quote string values in enums from string
+#
+
 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();