bk commit into 5.0 tree (sergefp:1.1979)

[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.1979 05/11/09 10:12:58 sergefp@stripped +3 -0
  Merge mysql.com:/home/psergey/mysql-4.1-nov08-push
  into mysql.com:/home/psergey/mysql-5.0-oct08-push

  sql/sql_table.cc
    1.284 05/11/09 10:12:54 sergefp@stripped +0 -0
    Auto merged

  mysql-test/t/create.test
    1.67 05/11/09 10:12:54 sergefp@stripped +0 -0
    Auto merged

  mysql-test/r/create.result
    1.105 05/11/09 10:12:54 sergefp@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:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-5.0-oct08-push/RESYNC

--- 1.283/sql/sql_table.cc	2005-11-08 11:17:13 +03:00
+++ 1.284/sql/sql_table.cc	2005-11-09 10:12:54 +03:00
@@ -840,6 +840,7 @@
 	else
 	{
 	  /* Field redefined */
+	  sql_field->def=		dup_field->def;
 	  sql_field->sql_type=		dup_field->sql_type;
 	  sql_field->charset=		(dup_field->charset ?
 					 dup_field->charset :

--- 1.104/mysql-test/r/create.result	2005-11-08 11:17:12 +03:00
+++ 1.105/mysql-test/r/create.result	2005-11-09 10:12:54 +03:00
@@ -719,4 +719,15 @@
 a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int,
 primary key (a1)
 ) select a1,a2,a3,a4,a5,a6,a7,a8,a9 from t1 ;
+drop table t2;
+create table t2 ( a int default 3, b int default 3)
+select a1,a2 from t1;
+show create table t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `a` int(11) default '3',
+  `b` int(11) default '3',
+  `a1` int(11) default NULL,
+  `a2` int(11) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2;

--- 1.66/mysql-test/t/create.test	2005-11-08 11:17:13 +03:00
+++ 1.67/mysql-test/t/create.test	2005-11-09 10:12:54 +03:00
@@ -614,6 +614,13 @@
   primary key (a1)
 ) select a1,a2,a3,a4,a5,a6,a7,a8,a9 from t1 ;
 
+# Test the default value
+drop table t2;
+
+create table t2 ( a int default 3, b int default 3)
+  select a1,a2 from t1;
+show create table t2;
+
 drop table t1, t2;
 
 # End of 4.1 tests