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

[Mattias Jonsson]

 3708 Mattias Jonsson	2012-01-08
      WL#4443
      
      Changed test to avoid hitting bug#13569548.

    modified:
      mysql-test/r/partition_locking.result
      mysql-test/t/partition_locking.test
 3707 Mattias Jonsson	2012-01-07
      WL#4443
      
      corrected bad DBUG_ASSERT in fill_table(**fields).

    modified:
      sql/sql_base.cc
=== modified file 'mysql-test/r/partition_locking.result'
--- a/mysql-test/r/partition_locking.result	revid:mattias.jonsson@stripped
+++ b/mysql-test/r/partition_locking.result	revid:mattias.jonsson@stripped
@@ -337,7 +337,7 @@ PRIMARY KEY (a,b,c,d))
 PARTITION BY RANGE COLUMNS (a, b)
 SUBPARTITION BY LINEAR KEY (d, c)
 SUBPARTITIONS 4
-(PARTITION pNeg VALUES LESS THAN (-1, MAXVALUE),
+(PARTITION pNeg VALUES LESS THAN (0, ""),
 PARTITION `p0-9` VALUES LESS THAN (9, MAXVALUE),
 PARTITION p10 VALUES LESS THAN (10, MAXVALUE),
 PARTITION `p11-100` VALUES LESS THAN (99, MAXVALUE));

=== modified file 'mysql-test/t/partition_locking.test'
--- a/mysql-test/t/partition_locking.test	revid:mattias.jonsson@stripped
+++ b/mysql-test/t/partition_locking.test	revid:mattias.jonsson@stripped
@@ -183,7 +183,7 @@ CREATE TABLE t3
 PARTITION BY RANGE COLUMNS (a, b)
 SUBPARTITION BY LINEAR KEY (d, c)
 SUBPARTITIONS 4
-(PARTITION pNeg VALUES LESS THAN (-1, MAXVALUE),
+(PARTITION pNeg VALUES LESS THAN (0, ""),
  PARTITION `p0-9` VALUES LESS THAN (9, MAXVALUE),
  PARTITION p10 VALUES LESS THAN (10, MAXVALUE),
  PARTITION `p11-100` VALUES LESS THAN (99, MAXVALUE));

No bundle (reason: useless for push emails).