From: Mattias Jonsson
Date: January 7 2012 12:40pm
Subject: bzr push into mysql-trunk branch (mattias.jonsson:3706 to 3707) WL#4443
List-Archive: http://lists.mysql.com/commits/142332
Message-Id: <201201071241.q07Cf2d1027248@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3707 Mattias Jonsson	2012-01-07
      WL#4443
      
      corrected bad DBUG_ASSERT in fill_table(**fields).

    modified:
      sql/sql_base.cc
 3706 Mattias Jonsson	2012-01-07
      WL#4443
      
      Fixed the check for insert fields in partitioning
      expressions.
      
      Added copy of default values if needed.
      
      Added checks and test for TIMESTAMP.

    modified:
      mysql-test/r/partition_locking.result
      mysql-test/t/partition_locking.test
      sql/field_conv.cc
      sql/partition_info.cc
      sql/partition_info.h
      sql/sql_base.cc
      sql/sql_insert.cc
=== modified file 'sql/sql_base.cc'
--- a/sql/sql_base.cc	revid:mattias.jonsson@stripped
+++ b/sql/sql_base.cc	revid:mattias.jonsson@stripped
@@ -9058,7 +9058,7 @@ fill_record(THD *thd, Field **ptr, List<
     if (value->save_in_field(field, 0) < 0)
       goto err;
   }
-  DBUG_ASSERT(!v++);                         // No extra value!
+  DBUG_ASSERT(thd->is_error() || !v++);      // No extra value!
   DBUG_RETURN(thd->is_error());
 
 err:

No bundle (reason: useless for push emails).