Merge with old maria tree

mysql-test/mysql-test-run.pl

@@ -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;

mysql-test/suite/maria/r/maria.result

@@ -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;

mysql-test/suite/maria/t/maria.test

@@ -1838,6 +1838,16 @@ ALTER TABLE t1 CHANGE c d varchar(10);
 --disable_info
 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
 

sql/ha_partition.cc

@@ -5288,7 +5288,6 @@ int ha_partition::extra(enum ha_extra_function operation)
   case HA_EXTRA_FLUSH_CACHE:
   {
     DBUG_RETURN(loop_extra(operation));
-    break;
   }
   case HA_EXTRA_NO_READCHECK:
   {