diff options
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 1 | ||||
| -rw-r--r-- | mysql-test/suite/maria/r/maria.result | 5 | ||||
| -rw-r--r-- | mysql-test/suite/maria/t/maria.test | 10 | ||||
| -rw-r--r-- | sql/ha_partition.cc | 1 |
4 files changed, 15 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index b5c98130d4c..4fb6ac59bce 100755 --- a/mysql-test/mysql-test-run.pl +++ b/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; diff --git a/mysql-test/suite/maria/r/maria.result b/mysql-test/suite/maria/r/maria.result index c406efd4112..ab554f0a433 100644 --- a/mysql-test/suite/maria/r/maria.result +++ b/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; diff --git a/mysql-test/suite/maria/t/maria.test b/mysql-test/suite/maria/t/maria.test index eddccc88b7c..216ac9df5c8 100644 --- a/mysql-test/suite/maria/t/maria.test +++ b/mysql-test/suite/maria/t/maria.test @@ -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); diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index f9be3ffded6..fb24d1d57db 100644 --- a/sql/ha_partition.cc +++ b/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: { |