diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-24 22:04:11 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-24 22:15:41 +0200 |
| commit | 1540224aa720e74502487b4a0364ce15e6c8370a (patch) | |
| tree | 1db7dcfeb903fbbaeeafd79dacd78ac4f52b16c7 | |
| parent | 67b5009e5c0e07e6903e84e04bc83bd616e69fd2 (diff) | |
| parent | 8936b175106a3fdfc560e9d33aa58a6372084c5f (diff) | |
| download | mariadb-git-bb-10.3-MDEV-15058.tar.gz | |
Merge 10.3 into bb-10.3-MDEV-15058bb-10.3-MDEV-15058
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | mysql-test/suite/parts/t/print_error.test | 1 | ||||
| -rw-r--r-- | mysql-test/suite/versioning/r/rpl.result | 7 | ||||
| -rw-r--r-- | mysql-test/suite/versioning/t/rpl.test | 13 | ||||
| -rw-r--r-- | sql/sql_class.cc | 3 | ||||
| -rw-r--r-- | storage/innobase/handler/handler0alter.cc | 4 |
6 files changed, 23 insertions, 7 deletions
@@ -1,4 +1,4 @@ MYSQL_VERSION_MAJOR=10 MYSQL_VERSION_MINOR=3 MYSQL_VERSION_PATCH=5 -SERVER_MATURITY=beta +SERVER_MATURITY=gamma diff --git a/mysql-test/suite/parts/t/print_error.test b/mysql-test/suite/parts/t/print_error.test index d410cc6856e..79da0d87f4b 100644 --- a/mysql-test/suite/parts/t/print_error.test +++ b/mysql-test/suite/parts/t/print_error.test @@ -2,6 +2,7 @@ # MDEV-15336 Server crashes in handler::print_error / ha_partition::print_error upon query timeout # --source include/have_innodb.inc +--source include/not_embedded.inc --source include/have_partition.inc CREATE TABLE t1 (i INT) ENGINE=InnoDB PARTITION BY HASH (i) PARTITIONS 2; diff --git a/mysql-test/suite/versioning/r/rpl.result b/mysql-test/suite/versioning/r/rpl.result index b5845a2d0b2..c5770a91c77 100644 --- a/mysql-test/suite/versioning/r/rpl.result +++ b/mysql-test/suite/versioning/r/rpl.result @@ -157,4 +157,11 @@ t1 CREATE TABLE `t1` ( ) ENGINE=INNODB_OR_MYISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING connection master; drop table t1, t2; +create table t1 (i int) with system versioning partition by system_time limit 8 ( partition p1 history, partition p2 history, partition pn current ); +insert into t1 values (1); +update t1 set i = 1; +update t1 set i = 0; +connection slave; +connection master; +drop table t1; include/rpl_end.inc diff --git a/mysql-test/suite/versioning/t/rpl.test b/mysql-test/suite/versioning/t/rpl.test index de8cfddd14a..a9e3af45af8 100644 --- a/mysql-test/suite/versioning/t/rpl.test +++ b/mysql-test/suite/versioning/t/rpl.test @@ -1,5 +1,5 @@ ---source include/have_binlog_format_mixed_or_statement.inc --source suite/versioning/engines.inc +--source include/have_partition.inc --source include/master-slave.inc #BUG#12662190 - COM_COMMIT IS NOT INCREMENTED FROM THE BINARY LOGS ON SLAVE, COM_BEGIN IS @@ -122,4 +122,15 @@ show create table t1; connection master; drop table t1, t2; +# +# MDEV-15395 Wrong result or Assertion `old_part_id == m_last_part' failed in ha_partition::update_row on slave +# +create table t1 (i int) with system versioning partition by system_time limit 8 ( partition p1 history, partition p2 history, partition pn current ); +insert into t1 values (1); +update t1 set i = 1; +update t1 set i = 0; +sync_slave_with_master; +connection master; +drop table t1; + --source include/rpl_end.inc diff --git a/sql/sql_class.cc b/sql/sql_class.cc index a86d40580db..f10a5e51b59 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -6197,9 +6197,6 @@ int THD::decide_logging_format(TABLE_LIST *tables) flags_write_some_set |= flags; is_write= TRUE; - if (table->table->versioned()) - flags_write_all_set &= HA_BINLOG_STMT_CAPABLE; - prev_write_table= table->table; } diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index e86c74728be..b775bfa40ee 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -1395,7 +1395,7 @@ innobase_set_foreign_key_option( foreign->type = DICT_FOREIGN_ON_DELETE_SET_NULL; break; case FK_OPTION_UNDEF: - DBUG_ASSERT(0); + break; } switch (fk_key->update_opt) { @@ -1411,7 +1411,7 @@ innobase_set_foreign_key_option( foreign->type |= DICT_FOREIGN_ON_UPDATE_SET_NULL; break; case FK_OPTION_UNDEF: - DBUG_ASSERT(0); + break; } return(innobase_check_fk_option(foreign)); |