bk commit into 5.0 tree (sergefp:1.1957) BUG#14139

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.0 repository of psergey. When psergey 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.1957 05/10/31 09:22:33 sergefp@stripped +4 -0
  BUG#14139 - Merge to 5.0

  sql/item.h
    1.178 05/10/31 09:18:22 sergefp@stripped +1 -0
    BUG#14139 - Merge to 5.0

  sql/field.h
    1.169 05/10/31 09:18:22 sergefp@stripped +4 -1
    BUG#14139 - Merge to 5.0

  mysql-test/t/create.test
    1.65 05/10/31 09:18:22 sergefp@stripped +1 -0
    BUG#14139 - Merge to 5.0

  mysql-test/r/create.result
    1.103 05/10/31 09:18:22 sergefp@stripped +3 -1
    BUG#14139 - Merge to 5.0

# 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:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-5.0-oct25-test

--- 1.168/sql/field.h	2005-10-29 02:36:53 +04:00
+++ 1.169/sql/field.h	2005-10-31 09:18:22 +03:00
@@ -1373,7 +1373,10 @@
     max number of characters. 
   */
   ulong length;
-  ulong length;
+  /*
+    The value of 'length' before a call to create_length_to_internal_length
+  */
+  uint32 chars_length;
   uint  decimals, flags, pack_length, key_length;
   Field::utype unireg_check;
   TYPELIB *interval;			// Which interval to use

--- 1.177/sql/item.h	2005-10-28 01:24:02 +04:00
+++ 1.178/sql/item.h	2005-10-31 09:18:22 +03:00
@@ -526,6 +526,7 @@
   double val_real_from_decimal();
 
   virtual Field *get_tmp_table_field() { return 0; }
+  /* This is also used to create fields in CREATE ... SELECT: */
   virtual Field *tmp_table_field(TABLE *t_arg) { return 0; }
   virtual const char *full_name() const { return name ? name : "???"; }
 

--- 1.102/mysql-test/r/create.result	2005-10-29 02:36:53 +04:00
+++ 1.103/mysql-test/r/create.result	2005-10-31 09:18:22 +03:00
@@ -645,10 +645,12 @@
 a varchar(112) charset utf8 collate utf8_bin not null,
 primary key (a)
 ) select 'test' as a ;
+Warnings:
+Warning	1364	Field 'a' doesn't have a default value
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(112) character set utf8 collate utf8_bin NOT NULL default '',
+  `a` varchar(112) character set utf8 collate utf8_bin NOT NULL,
   PRIMARY KEY  (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;

--- 1.64/mysql-test/t/create.test	2005-10-29 02:36:53 +04:00
+++ 1.65/mysql-test/t/create.test	2005-10-31 09:18:22 +03:00
@@ -550,6 +550,7 @@
   a varchar(112) charset utf8 collate utf8_bin not null,
   primary key (a)
 ) select 'test' as a ;
+--warning 1364
 show create table t1;
 drop table t1;