bzr commit into MySQL/Maria:mysql-maria branch (monty:2672)

[Michael Widenius]

#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-maria/ based on revid:monty@stripped

 2672 Michael Widenius	2009-02-01 [merge]
      Merge with old maria tree
modified:
  mysql-test/mysql-test-run.pl
  mysql-test/suite/maria/r/maria.result
  mysql-test/suite/maria/t/maria.test
  sql/ha_partition.cc

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-01-16 19:27:45 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-02-01 12:02:29 +0000
@@ -178,7 +178,6 @@ our @opt_extra_mysqltest_opt;
 
 our $opt_compress;
 our $opt_ssl;
-our $opt_skip_ssl;
 our $opt_ssl_supported;
 our $opt_ps_protocol;
 our $opt_sp_protocol;

=== modified file 'mysql-test/suite/maria/r/maria.result'
--- a/mysql-test/suite/maria/r/maria.result	2009-01-09 04:11:37 +0000
+++ b/mysql-test/suite/maria/r/maria.result	2009-02-01 12:02:29 +0000
@@ -2579,6 +2579,11 @@ ALTER TABLE t1 CHANGE c d varchar(10);
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 drop table t1;
+create table t1 (s1 int);
+insert into t1 values (1);
+alter table t1 partition by list (s1) (partition p1 values in (2));
+ERROR HY000: Table has no partition for value 1
+drop table t1;
 create table t1 (c1 int);
 create table t2 (c1 int);
 lock table t1 read, t2 read;

=== modified file 'mysql-test/suite/maria/t/maria.test'
--- a/mysql-test/suite/maria/t/maria.test	2009-01-09 04:11:37 +0000
+++ b/mysql-test/suite/maria/t/maria.test	2009-02-01 12:02:29 +0000
@@ -1839,6 +1839,16 @@ ALTER TABLE t1 CHANGE c d varchar(10);
 drop table t1;
 
 #
+# Bug #39227 Maria: crash with ALTER TABLE PARTITION
+#
+
+create table t1 (s1 int);
+insert into t1 values (1);
+--error ER_NO_PARTITION_FOR_GIVEN_VALUE
+alter table t1 partition by list (s1) (partition p1 values in (2));
+drop table t1;
+
+#
 # Bug #39226 Maria: crash with FLUSH TABLES WITH READ LOCK after LOCK TABLES
 
 create table t1 (c1 int);

=== modified file 'sql/ha_partition.cc'
--- a/sql/ha_partition.cc	2008-12-10 09:02:25 +0000
+++ b/sql/ha_partition.cc	2009-02-01 12:02:29 +0000
@@ -5288,7 +5288,6 @@ int ha_partition::extra(enum ha_extra_fu
   case HA_EXTRA_FLUSH_CACHE:
   {
     DBUG_RETURN(loop_extra(operation));
-    break;
   }
   case HA_EXTRA_NO_READCHECK:
   {