diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-09-06 09:43:16 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-09-08 15:49:03 +0300 |
| commit | fec844aca88e1c6b9c36bb0b811e92d9d023ffb9 (patch) | |
| tree | 3e8602113e591b163bf23fffe95c8908cac88ea3 /mysql-test/suite/handler | |
| parent | 2e814d4702d71a04388386a9f591d14a35980bfe (diff) | |
| download | mariadb-git-fec844aca88e1c6b9c36bb0b811e92d9d023ffb9.tar.gz | |
Merge InnoDB 5.7 from mysql-5.7.14.
Contains also:
MDEV-10549 mysqld: sql/handler.cc:2692: int handler::ha_index_first(uchar*): Assertion `table_share->tmp_table != NO_TMP_TABLE || m_lock_type != 2' failed. (branch bb-10.2-jan)
Unlike MySQL, InnoDB still uses THR_LOCK in MariaDB
MDEV-10548 Some of the debug sync waits do not work with InnoDB 5.7 (branch bb-10.2-jan)
enable tests that were fixed in MDEV-10549
MDEV-10548 Some of the debug sync waits do not work with InnoDB 5.7 (branch bb-10.2-jan)
fix main.innodb_mysql_sync - re-enable online alter for partitioned innodb tables
Diffstat (limited to 'mysql-test/suite/handler')
| -rw-r--r-- | mysql-test/suite/handler/disabled.def | 2 | ||||
| -rw-r--r-- | mysql-test/suite/handler/innodb.result | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/suite/handler/disabled.def b/mysql-test/suite/handler/disabled.def index ef63577b0cb..888298bbb09 100644 --- a/mysql-test/suite/handler/disabled.def +++ b/mysql-test/suite/handler/disabled.def @@ -9,5 +9,3 @@ # Do not use any TAB characters for whitespace. # ############################################################################## - -innodb : MDEV-10549
\ No newline at end of file diff --git a/mysql-test/suite/handler/innodb.result b/mysql-test/suite/handler/innodb.result index 102237617fd..f3c0f798902 100644 --- a/mysql-test/suite/handler/innodb.result +++ b/mysql-test/suite/handler/innodb.result @@ -545,6 +545,7 @@ optimize table t1; connection default; handler t1 read next; c1 +1 handler t1 close; connection con2; Table Op Msg_type Msg_text |