bk commit into 5.0 tree (bar:1.1928)

[bar]

Below is the list of changes that have just been committed into a local
5.0 repository of bar. When bar 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.1928 05/07/14 16:11:55 bar@stripped +5 -0
  Merge mysql.com:/usr/home/bar/mysql-4.1.num-conv
  into  mysql.com:/usr/home/bar/mysql-5.0

  sql/item.cc
    1.153 05/07/14 16:11:43 bar@stripped +25 -26
    After merge fix.

  sql/sql_table.cc
    1.261 05/07/14 16:01:40 bar@stripped +0 -0
    Auto merged

  sql/item.h
    1.152 05/07/14 16:01:40 bar@stripped +0 -0
    Auto merged

  mysql-test/t/ctype_utf8.test
    1.60 05/07/14 16:01:39 bar@stripped +0 -0
    Auto merged

  mysql-test/r/ctype_utf8.result
    1.68 05/07/14 16:01:39 bar@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:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.0/RESYNC

--- 1.152/sql/item.cc	2005-07-14 00:45:55 +05:00
+++ 1.153/sql/item.cc	2005-07-14 16:11:43 +05:00
@@ -601,15 +601,43 @@
 Item *Item::safe_charset_converter(CHARSET_INFO *tocs)
 {
   /*
+    Allow conversion from and to "binary".
     Don't allow automatic conversion to non-Unicode charsets,
     as it potentially loses data.
   */
-  if (!(tocs->state & MY_CS_UNICODE))
+  if (collation.collation != &my_charset_bin &&
+      tocs != &my_charset_bin &&
+      !(tocs->state & MY_CS_UNICODE))
     return NULL; // safe conversion is not possible
   return new Item_func_conv_charset(this, tocs);
 }
 
 
+/*
+  Created mostly for mysql_prepare_table(). Important
+  when a string ENUM/SET column is described with a numeric default value:
+
+  CREATE TABLE t1(a SET('a') DEFAULT 1);
+
+  We cannot use generic Item::safe_charset_converter(), because
+  the latter returns a non-fixed Item, so val_str() crashes afterwards.
+  Override Item_num method, to return a fixed item.
+*/
+Item *Item_num::safe_charset_converter(CHARSET_INFO *tocs)
+{
+  Item_string *conv;
+  char buf[64];
+  String *s, tmp(buf, sizeof(buf), &my_charset_bin);
+  s= val_str(&tmp);
+  if ((conv= new Item_string(s->ptr(), s->length(), s->charset())))
+  {
+    conv->str_value.copy();
+    conv->str_value.mark_as_const();
+  }
+  return conv;
+}
+
+
 Item *Item_string::safe_charset_converter(CHARSET_INFO *tocs)
 {
   Item_string *conv;
@@ -3753,6 +3781,20 @@
   }
   return FALSE;
 }
+
+
+Item *Item_varbinary::safe_charset_converter(CHARSET_INFO *tocs)
+{
+  Item_string *conv;
+  String tmp, *str= val_str(&tmp);
+
+  if (!(conv= new Item_string(str->ptr(), str->length(), tocs)))
+    return NULL;
+  conv->str_value.copy();
+  conv->str_value.mark_as_const();
+  return conv;
+}
+
 
 /*
   bin item.

--- 1.151/sql/item.h	2005-07-13 19:05:50 +05:00
+++ 1.152/sql/item.h	2005-07-14 16:01:40 +05:00
@@ -771,6 +771,7 @@
 {
 public:
   virtual Item_num *neg()= 0;
+  Item *safe_charset_converter(CHARSET_INFO *tocs);
 };
 
 #define NO_CACHED_FIELD_INDEX ((uint)(-1))
@@ -1369,6 +1370,7 @@
   // to prevent drop fixed flag (no need parent cleanup call)
   void cleanup() {}
   bool eq(const Item *item, bool binary_cmp) const;
+  virtual Item *safe_charset_converter(CHARSET_INFO *tocs);
 };
 
 

--- 1.260/sql/sql_table.cc	2005-07-13 14:48:03 +05:00
+++ 1.261/sql/sql_table.cc	2005-07-14 16:01:40 +05:00
@@ -752,10 +752,15 @@
         Convert the default value from client character
         set into the column character set if necessary.
       */
-      if (sql_field->def)
+      if (sql_field->def && cs != sql_field->def->collation.collation)
       {
-        sql_field->def= 
-          sql_field->def->safe_charset_converter(cs);
+        if (!(sql_field->def= 
+              sql_field->def->safe_charset_converter(cs)))
+        {
+          /* Could not convert */
+          my_error(ER_INVALID_DEFAULT, MYF(0), sql_field->field_name);
+          DBUG_RETURN(-1);
+        }
       }
 
       if (sql_field->sql_type == FIELD_TYPE_SET)

--- 1.67/mysql-test/r/ctype_utf8.result	2005-07-12 13:07:13 +05:00
+++ 1.68/mysql-test/r/ctype_utf8.result	2005-07-14 16:01:39 +05:00
@@ -905,6 +905,10 @@
 id	city
 2	Durban
 drop table t1;
+create table t1 (x set('A', 'B') default 0) character set utf8;
+ERROR 42000: Invalid default value for 'x'
+create table t1 (x enum('A', 'B') default 0) character set utf8;
+ERROR 42000: Invalid default value for 'x'
 SET NAMES UTF8;
 CREATE TABLE t1 (
 `id` int(20) NOT NULL auto_increment,

--- 1.59/mysql-test/t/ctype_utf8.test	2005-07-12 13:07:13 +05:00
+++ 1.60/mysql-test/t/ctype_utf8.test	2005-07-14 16:01:39 +05:00
@@ -748,6 +748,15 @@
 drop table t1;
 
 #
+# Bug #11819 CREATE TABLE with a SET DEFAULT 0 and UTF8 crashes server.
+#
+--error 1067
+create table t1 (x set('A', 'B') default 0) character set utf8;
+--error 1067
+create table t1 (x enum('A', 'B') default 0) character set utf8;
+
+
+#
 # Test for bug #11167: join for utf8 varchar value longer than 255 bytes 
 #