database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge InnoDB 5.7 from mysql-5.7.14.

Browse Source 
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
This commit is contained in:
Jan Lindström
2016-09-06 09:43:16 +03:00
parent 2e814d4702
commit fec844aca8
244 changed files with 15656 additions and 9099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/innodb_zip/t/16k-master.opt Normal file
View File

@ -0,0 +1,3 @@
--loose-innodb-sys-indexes
--loose-innodb-sys-tablespaces
--loose-innodb-sys-datafiles

8
mysql-test/suite/innodb_zip/t/16k.test
View File

@ -288,18 +288,18 @@ DROP TABLE t1;
SET SESSION innodb_strict_mode = ON;
SET GLOBAL innodb_file_per_table = OFF;
SHOW VARIABLES LIKE 'innodb_file_per_table';
--error ER_ILLEGAL_HA
--error ER_ILLEGAL_HA,1005
CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8;
SHOW WARNINGS;
--error ER_ILLEGAL_HA
--error ER_ILLEGAL_HA,1005
CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16;
SHOW WARNINGS;
SET GLOBAL innodb_file_per_table = ON;
SET GLOBAL innodb_file_format = `Antelope`;
--error ER_ILLEGAL_HA
--error ER_ILLEGAL_HA,1005
CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8;
SHOW WARNINGS;
--error ER_ILLEGAL_HA
--error ER_ILLEGAL_HA,1005
CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16;
SHOW WARNINGS;
SET GLOBAL innodb_file_format = `Barracuda`;

2
mysql-test/suite/innodb_zip/t/disabled.def
View File

@ -14,4 +14,4 @@ restart : Not supported by MariaDB 10.2 2/9/2016 jplindst
innochecksum : MDEV-10727 2/9/2016 jplindst
innochecksum_2 : MDEV-10727 2/9/2016 jplindst
innochecksum_3 : MDEV-10727 2/9/2016 jplindst
wl6560 : MDEV_10727

2
mysql-test/suite/innodb_zip/t/large_blob.test
View File

@ -3,7 +3,7 @@
--echo #
--source include/have_innodb.inc
--source include/have_nodebug.inc
--source include/not_debug.inc
--source include/big_test.inc
--disable_query_log

7
mysql-test/suite/innodb_zip/t/wl6560.test
View File

@ -164,12 +164,12 @@ select * from t1;
#
#
--echo "testing temp-table creation in --innodb_read_only mode"
let $restart_parameters = restart: --innodb-read-only;
let $restart_parameters=--innodb-read-only;
--source include/restart_mysqld.inc
#
use test;
show tables;
--error ER_INNODB_READ_ONLY
--error ER_INNODB_READ_ONLY, 1005
create temporary table t1 (keyc int, c1 char(100), c2 char(100)) engine = innodb;
#-----------------------------------------------------------------------------
@ -198,7 +198,7 @@ drop table t1;
# and insert enough data to make it full.
#
--echo # test condition of full-temp-tablespace
let $restart_parameters = restart: --innodb_temp_data_file_path=ibtmp1:12M;
let $restart_parameters=--innodb_temp_data_file_path=ibtmp1:12M;
--source include/restart_mysqld.inc
#
create temporary table t1
@ -366,7 +366,6 @@ let SEARCH_PATTERN = support raw device;
--source include/search_pattern_in_file.inc
--remove_file $SEARCH_FILE
let $restart_parameters = restart;
--source include/start_mysqld.inc
show tables;

4
mysql-test/suite/innodb_zip/t/wl6915_1.test
View File

@ -517,7 +517,7 @@ connection default;
#
## trying with VALUES innodb_undo_tablespaces, innodb_undo_logs ,innodb_log_files_in_group
##
let $restart_parameters = restart: --innodb_undo_tablespaces=0 --innodb_rollback_segments=20 --innodb_undo_logs=20 --innodb_log_files_in_group=4;
let $restart_parameters=--innodb_undo_tablespaces=0 --innodb_rollback_segments=20 --innodb_undo_logs=20 --innodb_log_files_in_group=4;
--source include/restart_mysqld.inc
# Create two client for concurrent execution
@ -574,7 +574,7 @@ disconnect con2;
connection default;
# innodb_undo_logs > non redo rsegment
let $restart_parameters = restart: --innodb_undo_tablespaces=0 --innodb_rollback_segments=30 --innodb_undo_logs=20 --innodb_log_files_in_group=4;
let $restart_parameters=--innodb_undo_tablespaces=0 --innodb_rollback_segments=30 --innodb_undo_logs=20 --innodb_log_files_in_group=4;
--source include/restart_mysqld.inc
connect (con1,localhost,root,,);