bk commit into 4.1 tree (1.1618)

[sinisa]

Below is the list of changes that have just been committed into a local
4.1 repository of Sinisa. When Sinisa 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.1618 03/08/19 16:35:17 Sinisa@stripped +3 -0
  A fix for a bug with long definition of SET or ENUM.
  
  Barkov approved it already
  

  sql/sql_parse.cc
    1.286 03/08/19 16:35:11 Sinisa@stripped +3 -2
    A fix for a bug with long definition of SET or ENUM.
    
    Barkov approved it already
    

  mysql-test/t/type_set.test
    1.4 03/08/19 16:35:11 Sinisa@stripped +2 -0
    A fix for a bug with long definition of SET or ENUM.
    
    Barkov approved it already
    

  mysql-test/r/type_set.result
    1.7 03/08/19 16:35:10 Sinisa@stripped +2 -0
    A fix for a bug with long definition of SET or ENUM.
    
    Barkov approved it already
    

# 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:	Sinisa
# Host:	sinisa.nasamreza.org
# Root:	/mnt/work/mysql-4.1

--- 1.285/sql/sql_parse.cc	Mon Aug 11 16:18:31 2003
+++ 1.286/sql/sql_parse.cc	Tue Aug 19 16:35:11 2003
@@ -3967,9 +3967,10 @@
     }
   }
 
-  if (new_field->length > MAX_FIELD_CHARLENGTH ||
+  if ((new_field->length > MAX_FIELD_CHARLENGTH && type != FIELD_TYPE_SET && 
+       type != FIELD_TYPE_ENUM) ||
       (!new_field->length && !(new_field->flags & BLOB_FLAG) &&
-       type != FIELD_TYPE_STRING && 
+       type != FIELD_TYPE_STRING &&
        type != FIELD_TYPE_VAR_STRING && type != FIELD_TYPE_GEOMETRY))
   {
     net_printf(thd,ER_TOO_BIG_FIELDLENGTH,field_name,

--- 1.6/mysql-test/r/type_set.result	Tue Jan 14 14:28:33 2003
+++ 1.7/mysql-test/r/type_set.result	Tue Aug 19 16:35:10 2003
@@ -13,3 +13,5 @@
   `a` set('','a','b') NOT NULL default 'b'
 ) TYPE=MyISAM CHARSET=latin1
 drop table t1;
+CREATE TABLE t1 (   user varchar(64) NOT NULL default '',   path varchar(255) NOT NULL default '',   privilege   set('select','RESERVED30','RESERVED29','RESERVED28','RESERVED27','RESERVED26',   'RESERVED25','RESERVED24','data.delete','RESERVED22','RESERVED21',   'RESERVED20','data.insert.none','data.insert.approve',   'data.insert.delete','data.insert.move','data.insert.propose',   'data.insert.reject','RESERVED13','RESERVED12','RESERVED11','RESERVED10',   'RESERVED09','data.update','RESERVED07','RESERVED06','RESERVED05',   'RESERVED04','metadata.delete','metadata.put','RESERVED01','RESERVED00')   NOT NULL default '',   KEY user (user)   ) TYPE=MyISAM CHARSET=utf8;
+DROP TABLE t1;

--- 1.3/mysql-test/t/type_set.test	Mon Jan  6 01:48:53 2003
+++ 1.4/mysql-test/t/type_set.test	Tue Aug 19 16:35:11 2003
@@ -12,3 +12,5 @@
 create table t1 (a set (' ','a','b ') not null default 'b ');
 show create table t1;
 drop table t1;
+CREATE TABLE t1 (   user varchar(64) NOT NULL default '',   path varchar(255) NOT NULL default '',   privilege   set('select','RESERVED30','RESERVED29','RESERVED28','RESERVED27','RESERVED26',   'RESERVED25','RESERVED24','data.delete','RESERVED22','RESERVED21',   'RESERVED20','data.insert.none','data.insert.approve',   'data.insert.delete','data.insert.move','data.insert.propose',   'data.insert.reject','RESERVED13','RESERVED12','RESERVED11','RESERVED10',   'RESERVED09','data.update','RESERVED07','RESERVED06','RESERVED05',   'RESERVED04','metadata.delete','metadata.put','RESERVED01','RESERVED00')   NOT NULL default '',   KEY user (user)   ) TYPE=MyISAM CHARSET=utf8;
+DROP TABLE t1;