bk commit into 5.0 tree (msvensson:1.2005)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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.2005 05/06/27 14:26:07 msvensson@neptunus.(none) +1 -0
  Simpler impl.

  sql/sql_parse.cc
    1.461 05/06/27 14:26:04 msvensson@neptunus.(none) +4 -6
    Just do a simple sprintf to format error message.

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0

--- 1.460/sql/sql_parse.cc	2005-06-27 13:12:08 +02:00
+++ 1.461/sql/sql_parse.cc	2005-06-27 14:26:04 +02:00
@@ -5499,15 +5499,13 @@
        In other words, for declarations such as TIMESTAMP(2), TIMESTAMP(4),
        and so on, the display width is ignored.
     */
-    char buff[32];
-    String str(buff,(uint32) sizeof(buff), system_charset_info);
-    str.append("TIMESTAMP(");
-    str.append(length);
-    str.append(")");
+    char buf[32];
+    my_snprintf(buf, sizeof(buf),
+                "TIMESTAMP(%s)", length, system_charset_info);
     push_warning_printf(thd,MYSQL_ERROR::WARN_LEVEL_WARN,
                         ER_WARN_DEPRECATED_SYNTAX,
                         ER(ER_WARN_DEPRECATED_SYNTAX),
-                        str.c_ptr(), "TIMESTAMP");
+                        buf, "TIMESTAMP");
   }
 
   if (!(new_field= new_create_field(thd, field_name, type, length, decimals,