bk commit into 5.0 tree (gluh:1.2118)

[gluh]

Below is the list of changes that have just been committed into a local
5.0 repository of gluh. When gluh 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.2118 06/03/30 09:13:25 gluh@stripped +3 -0
  post-merge fix

  sql/sql_table.cc
    1.302 06/03/30 09:13:19 gluh@stripped +1 -3
    post-merge fix

  mysql-test/t/create.test
    1.77 06/03/30 09:13:19 gluh@stripped +1 -1
    post-merge fix

  mysql-test/r/create.result
    1.115 06/03/30 09:13:19 gluh@stripped +1 -1
    post-merge fix

# 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:	gluh
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/gluh/MySQL/Merge/5.0

--- 1.301/sql/sql_table.cc	Thu Mar 30 08:07:21 2006
+++ 1.302/sql/sql_table.cc	Thu Mar 30 09:13:19 2006
@@ -770,9 +770,7 @@ static int mysql_prepare_table(THD *thd,
                                 interval->type_lengths[i], 
                                 comma_buf, comma_length, NULL, 0))
             {
-              my_printf_error(ER_UNKNOWN_ERROR,
-                              "Illegal %s '%-.64s' value found during parsing",
-                              MYF(0), "set", tmp->ptr());
+              my_error(ER_ILLEGAL_VALUE_FOR_TYPE, MYF(0), "set", tmp->ptr());
               DBUG_RETURN(-1);
             }
           }

--- 1.114/mysql-test/r/create.result	Thu Mar 30 08:13:23 2006
+++ 1.115/mysql-test/r/create.result	Thu Mar 30 09:13:19 2006
@@ -747,7 +747,7 @@ t2	CREATE TABLE `t2` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2;
 create table t1(a set("a,b","c,d") not null);
-ERROR HY000: Illegal set 'a,b' value found during parsing
+ERROR 22007: Illegal set 'a,b' value found during parsing
 create table t1 (i int) engine=myisam max_rows=100000000000;
 show create table t1;
 Table	Create Table

--- 1.76/mysql-test/t/create.test	Thu Mar 30 08:07:21 2006
+++ 1.77/mysql-test/t/create.test	Thu Mar 30 09:13:19 2006
@@ -649,7 +649,7 @@ drop table t1, t2;
 #
 # Bug #15316 SET value having comma not correctly handled
 #
---error 1105
+--error 1367
 create table t1(a set("a,b","c,d") not null);
 
 # End of 4.1 tests