mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Merge InnoDB 5.7 from mysql-5.7.9.
Contains also
MDEV-10547: Test multi_update_innodb fails with InnoDB 5.7
The failure happened because 5.7 has changed the signature of
the bool handler::primary_key_is_clustered() const
virtual function ("const" was added). InnoDB was using the old
signature which caused the function not to be used.
MDEV-10550: Parallel replication lock waits/deadlock handling does not work with InnoDB 5.7
Fixed mutexing problem on lock_trx_handle_wait. Note that
rpl_parallel and rpl_optimistic_parallel tests still
fail.
MDEV-10156 : Group commit tests fail on 10.2 InnoDB (branch bb-10.2-jan)
Reason: incorrect merge
MDEV-10550: Parallel replication can't sync with master in InnoDB 5.7 (branch bb-10.2-jan)
Reason: incorrect merge
This commit is contained in:
@@ -21,7 +21,7 @@ TABLE_NAME t1
|
||||
TABLE_TYPE BASE TABLE
|
||||
ENGINE InnoDB
|
||||
VERSION 10
|
||||
ROW_FORMAT Compact
|
||||
ROW_FORMAT DYNAMIC_OR_PAGE
|
||||
TABLE_ROWS #TBLR#
|
||||
AVG_ROW_LENGTH #ARL#
|
||||
DATA_LENGTH #DL#
|
||||
@@ -44,7 +44,7 @@ TABLE_NAME t2
|
||||
TABLE_TYPE BASE TABLE
|
||||
ENGINE InnoDB
|
||||
VERSION 10
|
||||
ROW_FORMAT Compact
|
||||
ROW_FORMAT DYNAMIC_OR_PAGE
|
||||
TABLE_ROWS #TBLR#
|
||||
AVG_ROW_LENGTH #ARL#
|
||||
DATA_LENGTH #DL#
|
||||
@@ -67,7 +67,7 @@ TABLE_NAME t1
|
||||
TABLE_TYPE BASE TABLE
|
||||
ENGINE InnoDB
|
||||
VERSION 10
|
||||
ROW_FORMAT Compact
|
||||
ROW_FORMAT DYNAMIC_OR_PAGE
|
||||
TABLE_ROWS #TBLR#
|
||||
AVG_ROW_LENGTH #ARL#
|
||||
DATA_LENGTH #DL#
|
||||
@@ -111,7 +111,7 @@ TABLE_NAME t1
|
||||
TABLE_TYPE BASE TABLE
|
||||
ENGINE InnoDB
|
||||
VERSION 10
|
||||
ROW_FORMAT Compact
|
||||
ROW_FORMAT DYNAMIC_OR_PAGE
|
||||
TABLE_ROWS #TBLR#
|
||||
AVG_ROW_LENGTH #ARL#
|
||||
DATA_LENGTH #DL#
|
||||
@@ -134,7 +134,7 @@ TABLE_NAME t2
|
||||
TABLE_TYPE BASE TABLE
|
||||
ENGINE InnoDB
|
||||
VERSION 10
|
||||
ROW_FORMAT Compact
|
||||
ROW_FORMAT DYNAMIC_OR_PAGE
|
||||
TABLE_ROWS #TBLR#
|
||||
AVG_ROW_LENGTH #ARL#
|
||||
DATA_LENGTH #DL#
|
||||
|
||||
Reference in New Issue
Block a user