bk commit into 5.0 tree (igor:1.2135) BUG#19089

[igor]

Below is the list of changes that have just been committed into a local
5.0 repository of igor. When igor 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.2135 06/05/22 07:57:46 igor@stripped +4 -0
  Post-review fixes for bug #19089

  sql/sql_select.cc
    1.418 06/05/22 07:57:40 igor@stripped +3 -0
    Post-review fixes.

  sql/field.h
    1.179 06/05/22 07:57:40 igor@stripped +5 -0
    Post-review fixes.

  sql/field.cc
    1.306 06/05/22 07:57:40 igor@stripped +1 -2
    Post-review fixes.

  mysql-test/r/view.result
    1.160 06/05/22 07:57:40 igor@stripped +1 -1
    Post-review fixes.

# 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:	igor
# Host:	rurik.mysql.com
# Root:	/home/igor/dev/mysql-5.0-0

--- 1.305/sql/field.cc	2006-05-20 18:54:36 -07:00
+++ 1.306/sql/field.cc	2006-05-22 07:57:40 -07:00
@@ -1228,12 +1228,11 @@
    field_name(field_name_arg),
    query_id(0), key_start(0), part_of_key(0), part_of_sortkey(0),
    unireg_check(unireg_check_arg),
-   field_length(length_arg),null_bit(null_bit_arg)
+   field_length(length_arg), null_bit(null_bit_arg), dflt_field(0)
 {
   flags=null_ptr ? 0: NOT_NULL_FLAG;
   comment.str= (char*) "";
   comment.length=0;
-  dflt_field= 0;
 }
 
 uint Field::offset()

--- 1.178/sql/field.h	2006-05-20 18:54:36 -07:00
+++ 1.179/sql/field.h	2006-05-22 07:57:40 -07:00
@@ -53,6 +53,11 @@
 
   char		*ptr;			// Position to field in record
   uchar		*null_ptr;		// Byte where null_bit is
+  /*
+    dflt_field is used only for the fields of temporary tables.
+    It points to the default value of the field in another table
+    from which this field has been created.
+  */ 
   Field         *dflt_field;            // Field to copy default value from
   /*
     Note that you can use table->in_use as replacement for current_thd member 

--- 1.417/sql/sql_select.cc	2006-05-20 19:05:20 -07:00
+++ 1.418/sql/sql_select.cc	2006-05-22 07:57:40 -07:00
@@ -8697,7 +8697,10 @@
       if (is_null)
         field->set_null();
       else
+      {
+        field->set_notnull();
         memcpy(field->ptr, from, field->pack_length());
+      }
     } 
 
     if (from_field[i])

--- 1.159/mysql-test/r/view.result	2006-05-20 19:10:38 -07:00
+++ 1.160/mysql-test/r/view.result	2006-05-22 07:57:40 -07:00
@@ -2716,7 +2716,7 @@
 a	m
 xxx	1
 yyy	5
-NULL	0
+xxx	0
 DROP VIEW v1;
 DROP TABLE t1,t2;
 CREATE TABLE t1 (id int PRIMARY KEY, e ENUM('a','b') NOT NULL DEFAULT 'b');