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

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2019-11-14 14:49:20 +02:00
parent c454b8964c 89ae01fd00
commit ae90f8431b
49 changed files with 1040 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/innodb_zip/r/bug53591.result
View File

@@ -1,3 +1,4 @@
call mtr.add_suppression('InnoDB: Cannot add field.*because after adding it, the row size is');
SET GLOBAL innodb_file_per_table=on;
SET GLOBAL innodb_strict_mode=on;
set old_alter_table=0;

1
mysql-test/suite/innodb_zip/r/prefix_index_liftedlimit.result
View File

@@ -1,3 +1,4 @@
call mtr.add_suppression('InnoDB: Cannot add field.*because after adding it, the row size is');
CREATE TABLE worklog5743 (
col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
PRIMARY KEY (col_1_varchar(3072))

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

@@ -1,5 +1,7 @@
-- source include/innodb_page_size_small.inc
call mtr.add_suppression('InnoDB: Cannot add field.*because after adding it, the row size is');
let $file_per_table=`select @@innodb_file_per_table`;
SET GLOBAL innodb_file_per_table=on;

1
mysql-test/suite/innodb_zip/t/prefix_index_liftedlimit.test
View File

@@ -15,6 +15,7 @@
--source include/have_innodb.inc
--source include/have_innodb_16k.inc
call mtr.add_suppression('InnoDB: Cannot add field.*because after adding it, the row size is');
# Prefix index with VARCHAR data type , primary/secondary index and DML ops
CREATE TABLE worklog5743 (
col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,