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.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2022-02-17 14:37:17 +02:00
parent 8bc5bf2cb6 cac995ec6f
commit f04b459fb7
42 changed files with 678 additions and 782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/innodb_zip/include/innodb_create_tab_indx.inc
View File

@@ -2,7 +2,7 @@
eval CREATE TABLE tab5(col_1 TINYBLOB, col_2 TINYTEXT,col_3 BLOB,
col_4 TEXT,col_5 MEDIUMBLOB,col_6 MEDIUMTEXT,
col_7 LONGBLOB,col_8 LONGTEXT,col_9 VARCHAR(255))
col_7 LONGBLOB,col_8 LONGTEXT,col_9 VARCHAR(67))
ENGINE=INNODB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=$block_size;

18
mysql-test/suite/innodb_zip/include/innodb_load_data.inc
View File

@@ -1,14 +1,14 @@
--echo # Load the data
SET @col_1 = repeat('a', 100);
SET @col_2 = repeat('b', 100);
SET @col_3 = repeat('c', 100);
SET @col_4 = repeat('d', 100);
SET @col_5 = repeat('e', 100);
SET @col_6 = repeat('f', 100);
SET @col_7 = repeat('g', 100);
SET @col_8 = repeat('h', 100);
SET @col_9 = repeat('i', 100);
SET @col_1 = repeat('a', 67);
SET @col_2 = repeat('b', 67);
SET @col_3 = repeat('c', 67);
SET @col_4 = repeat('d', 67);
SET @col_5 = repeat('e', 67);
SET @col_6 = repeat('f', 67);
SET @col_7 = repeat('g', 67);
SET @col_8 = repeat('h', 67);
SET @col_9 = repeat('i', 67);
while ($i) {