bk commit into 5.0 tree (ingo:1.1986)

[ingo]

Below is the list of changes that have just been committed into a local
5.0 repository of istruewing. When istruewing 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.1986 05/11/21 23:30:14 ingo@stripped +1 -0
  Merge istruewing@stripped:/home/bk/mysql-5.0
  into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0

  sql/field.cc
    1.292 05/11/21 23:30:09 ingo@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:	ingo
# Host:	production.mysql.com
# Root:	/usersnfs/istruewing/autopush/mysql-5.0/RESYNC

--- 1.291/sql/field.cc	2005-11-14 19:53:36 +01:00
+++ 1.292/sql/field.cc	2005-11-21 23:30:09 +01:00
@@ -1272,9 +1272,9 @@
 void Field_num::add_zerofill_and_unsigned(String &res) const
 {
   if (unsigned_flag)
-    res.append(" unsigned");
+    res.append(STRING_WITH_LEN(" unsigned"));
   if (zerofill)
-    res.append(" zerofill");
+    res.append(STRING_WITH_LEN(" zerofill"));
 }
 
 
@@ -1655,7 +1655,7 @@
 
 void Field_null::sql_type(String &res) const
 {
-  res.set_ascii("null", 4);
+  res.set_ascii(STRING_WITH_LEN("null"));
 }
 
 
@@ -1667,7 +1667,7 @@
 void
 Field_decimal::reset(void)
 {
-  Field_decimal::store("0",1,&my_charset_bin);
+  Field_decimal::store(STRING_WITH_LEN("0"),&my_charset_bin);
 }
 
 void Field_decimal::overflow(bool negative)
@@ -4113,7 +4113,7 @@
 {
   if (dec == NOT_FIXED_DEC)
   {
-    res.set_ascii("float", 5);
+    res.set_ascii(STRING_WITH_LEN("float"));
   }
   else
   {
@@ -4384,7 +4384,7 @@
   CHARSET_INFO *cs=res.charset();
   if (dec == NOT_FIXED_DEC)
   {
-    res.set_ascii("double",6);
+    res.set_ascii(STRING_WITH_LEN("double"));
   }
   else
   {
@@ -4673,7 +4673,7 @@
 
   if (temp == 0L)
   {				      /* Zero time is "000000" */
-    val_ptr->set("0000-00-00 00:00:00", 19, &my_charset_bin);
+    val_ptr->set(STRING_WITH_LEN("0000-00-00 00:00:00"), &my_charset_bin);
     return val_ptr;
   }
   val_buffer->set_charset(&my_charset_bin);	// Safety
@@ -4805,7 +4805,7 @@
 
 void Field_timestamp::sql_type(String &res) const
 {
-  res.set_ascii("timestamp", 9);
+  res.set_ascii(STRING_WITH_LEN("timestamp"));
 }
 
 
@@ -5074,7 +5074,7 @@
 
 void Field_time::sql_type(String &res) const
 {
-  res.set_ascii("time", 4);
+  res.set_ascii(STRING_WITH_LEN("time"));
 }
 
 /****************************************************************************
@@ -5381,7 +5381,7 @@
 
 void Field_date::sql_type(String &res) const
 {
-  res.set_ascii("date", 4);
+  res.set_ascii(STRING_WITH_LEN("date"));
 }
 
 
@@ -5564,7 +5564,7 @@
 
 void Field_newdate::sql_type(String &res) const
 {
-  res.set_ascii("date", 4);
+  res.set_ascii(STRING_WITH_LEN("date"));
 }
 
 
@@ -5838,7 +5838,7 @@
 
 void Field_datetime::sql_type(String &res) const
 {
-  res.set_ascii("datetime", 8);
+  res.set_ascii(STRING_WITH_LEN("datetime"));
 }
 
 /****************************************************************************
@@ -6061,7 +6061,7 @@
   res.length(length);
   if ((thd->variables.sql_mode & (MODE_MYSQL323 | MODE_MYSQL40)) &&
       has_charset() && (charset()->state & MY_CS_BINSORT))
-    res.append(" binary");
+    res.append(STRING_WITH_LEN(" binary"));
 }
 
 
@@ -6457,7 +6457,7 @@
   res.length(length);
   if ((thd->variables.sql_mode & (MODE_MYSQL323 | MODE_MYSQL40)) &&
       has_charset() && (charset()->state & MY_CS_BINSORT))
-    res.append(" binary");
+    res.append(STRING_WITH_LEN(" binary"));
 }
 
 
@@ -7177,10 +7177,10 @@
   }
   res.set_ascii(str,length);
   if (charset() == &my_charset_bin)
-    res.append("blob");
+    res.append(STRING_WITH_LEN("blob"));
   else
   {
-    res.append("text");
+    res.append(STRING_WITH_LEN("text"));
   }
 }
 
@@ -7400,28 +7400,28 @@
   switch (geom_type)
   {
     case GEOM_POINT:
-     res.set("point", 5, cs);
+     res.set(STRING_WITH_LEN("point"), cs);
      break;
     case GEOM_LINESTRING:
-     res.set("linestring", 10, cs);
+     res.set(STRING_WITH_LEN("linestring"), cs);
      break;
     case GEOM_POLYGON:
-     res.set("polygon", 7, cs);
+     res.set(STRING_WITH_LEN("polygon"), cs);
      break;
     case GEOM_MULTIPOINT:
-     res.set("multipoint", 10, cs);
+     res.set(STRING_WITH_LEN("multipoint"), cs);
      break;
     case GEOM_MULTILINESTRING:
-     res.set("multilinestring", 15, cs);
+     res.set(STRING_WITH_LEN("multilinestring"), cs);
      break;
     case GEOM_MULTIPOLYGON:
-     res.set("multipolygon", 12, cs);
+     res.set(STRING_WITH_LEN("multipolygon"), cs);
      break;
     case GEOM_GEOMETRYCOLLECTION:
-     res.set("geometrycollection", 18, cs);
+     res.set(STRING_WITH_LEN("geometrycollection"), cs);
      break;
     default:
-     res.set("geometry", 8, cs);
+     res.set(STRING_WITH_LEN("geometry"), cs);
   }
 }
 
@@ -7698,7 +7698,7 @@
   String enum_item(buffer, sizeof(buffer), res.charset());
 
   res.length(0);
-  res.append("enum(");
+  res.append(STRING_WITH_LEN("enum("));
 
   bool flag=0;
   uint *len= typelib->type_lengths;
@@ -7812,7 +7812,7 @@
   String set_item(buffer, sizeof(buffer), res.charset());
 
   res.length(0);
-  res.append("set(");
+  res.append(STRING_WITH_LEN("set("));
 
   bool flag=0;
   uint *len= typelib->type_lengths;