bzr push into mysql-trunk branch (mattias.jonsson:3801 to 3802) WL#4443

[Mattias Jonsson]

 3802 Mattias Jonsson	2012-05-13
      WL#4443:
      Fixed result file.
      
      Removed DBUG_ASSERT:
      DBUG_ASSERT(bitmap_is_subset(&m_partitions_to_reset,
                               &m_part_info->lock_partitions));
      
      This fails for the first PREPARE call after LOCK TABLES.

    modified:
      mysql-test/r/partition_error.result
      sql/ha_partition.cc
 3801 Mattias Jonsson	2012-05-13
      WL#4443:
      Changes for the second 1/3 of dlenevs review comments chunk 2.
      
      Test fixes in partition_locking (including in moving out tests to
      partition_default_functions.inc)
      
      Removed duplicate warnings from insert pruning.
      
      warns if PARTITION () clause is used on temporary tables.
      
      Fixed default functions in insert pruning.
      
      + some cleanups

    added:
      mysql-test/include/partition_default_functions.inc
    modified:
      include/my_time.h
      mysql-test/r/partition_datatype.result
      mysql-test/r/partition_explicit_prune.result
      mysql-test/r/partition_locking.result
      mysql-test/t/partition_explicit_prune.test
      mysql-test/t/partition_locking.test
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.cc
      sql/log_event.cc
      sql/opt_range.cc
      sql/opt_range.h
      sql/partition_info.cc
      sql/partition_info.h
      sql/share/errmsg-utf8.txt
      sql/sp.cc
      sql/sql_base.cc
      sql/sql_base.h
      sql/sql_class.cc
      sql/sql_delete.cc
      sql/sql_handler.cc
      sql/sql_insert.cc
      sql/sql_join_buffer.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_optimizer.cc
      sql/sql_partition.h
      sql/sql_partition_admin.cc
      sql/sql_resolver.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_show.cc
      sql/sql_tmp_table.cc
      sql/sql_union.cc
      sql/sql_update.cc
=== modified file 'mysql-test/r/partition_error.result'
--- a/mysql-test/r/partition_error.result	revid:mattias.jonsson@stripped
+++ b/mysql-test/r/partition_error.result	revid:mattias.jonsson@stripped
@@ -47,15 +47,11 @@ PARTITION BY RANGE (DAYOFWEEK(a))
 (PARTITION a1 VALUES LESS THAN (60));
 INSERT INTO t1 VALUES ('test'),('a'),('5');
 Warnings:
-Warning	1292	Incorrect date value: 'test' for column 'a' at row 1
-Warning	1292	Incorrect date value: 'a' for column 'a' at row 1
 Warning	1265	Data truncated for column 'a' at row 1
 Warning	1265	Data truncated for column 'a' at row 2
 Warning	1265	Data truncated for column 'a' at row 3
 SHOW WARNINGS;
 Level	Code	Message
-Warning	1292	Incorrect date value: 'test' for column 'a' at row 1
-Warning	1292	Incorrect date value: 'a' for column 'a' at row 1
 Warning	1265	Data truncated for column 'a' at row 1
 Warning	1265	Data truncated for column 'a' at row 2
 Warning	1265	Data truncated for column 'a' at row 3
@@ -65,15 +61,11 @@ PARTITION BY RANGE (DAYOFWEEK(a))
 (PARTITION a1 VALUES LESS THAN (60));
 INSERT INTO t1 VALUES ('test'),('a'),('5');
 Warnings:
-Warning	1292	Incorrect datetime value: 'test' for column 'a' at row 1
-Warning	1292	Incorrect datetime value: 'a' for column 'a' at row 1
 Warning	1265	Data truncated for column 'a' at row 1
 Warning	1265	Data truncated for column 'a' at row 2
 Warning	1265	Data truncated for column 'a' at row 3
 SHOW WARNINGS;
 Level	Code	Message
-Warning	1292	Incorrect datetime value: 'test' for column 'a' at row 1
-Warning	1292	Incorrect datetime value: 'a' for column 'a' at row 1
 Warning	1265	Data truncated for column 'a' at row 1
 Warning	1265	Data truncated for column 'a' at row 2
 Warning	1265	Data truncated for column 'a' at row 3

=== modified file 'sql/ha_partition.cc'
--- a/sql/ha_partition.cc	revid:mattias.jonsson@stripped
+++ b/sql/ha_partition.cc	revid:mattias.jonsson@stripped
@@ -6548,8 +6548,6 @@ int ha_partition::reset(void)
     int tmp;
     uint i;
 
-    DBUG_ASSERT(bitmap_is_subset(&m_partitions_to_reset,
-                                 &m_part_info->lock_partitions));
     for (i= bitmap_get_first_set(&m_partitions_to_reset);
          i < m_tot_parts;
          i= bitmap_get_next_set(&m_partitions_to_reset, i))

No bundle (reason: useless for push emails).