database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge bb-10.2-ext into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2017-06-19 17:28:08 +03:00
parent 0fe7d8a2a2 3a7201ea92
commit 1e3886ae80
725 changed files with 17193 additions and 16743 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/innodb_zip/t/bug36169.test
View File

@ -3,8 +3,7 @@
# http://bugs.mysql.com/36169
#
-- source include/have_innodb.inc
-- source include/have_innodb_zip.inc
-- source include/innodb_page_size_small.inc
let $file_per_table=`select @@innodb_file_per_table`;
SET GLOBAL innodb_file_per_table=ON;

3
mysql-test/suite/innodb_zip/t/bug52745.test
View File

@ -1,5 +1,4 @@
-- source include/have_innodb.inc
-- source include/have_innodb_zip.inc
-- source include/innodb_page_size_small.inc
let $file_per_table=`select @@innodb_file_per_table`;
SET GLOBAL innodb_file_per_table=on;

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

@ -1,5 +1,4 @@
-- source include/have_innodb.inc
-- source include/have_innodb_zip.inc
-- source include/innodb_page_size_small.inc
let $file_per_table=`select @@innodb_file_per_table`;

3
mysql-test/suite/innodb_zip/t/bug56680.test
View File

@ -3,8 +3,7 @@
#
# Bug #56680 InnoDB may return wrong results from a case-insensitive index
#
-- source include/have_innodb.inc
-- source include/have_innodb_zip.inc
-- source include/innodb_page_size_small.inc
-- disable_query_log
SET @tx_isolation_orig = @@tx_isolation;

3
mysql-test/suite/innodb_zip/t/create_options.test
View File

@ -56,8 +56,7 @@
# since they are rejected for InnoDB page sizes of 8k and 16k.
# See innodb_16k and innodb_8k for those tests.
-- source include/have_innodb.inc
-- source include/have_innodb_zip.inc
--source include/innodb_page_size_small.inc
SET default_storage_engine=InnoDB;
# These values can change during the test

3
mysql-test/suite/innodb_zip/t/innochecksum.test
View File

@ -1,8 +1,7 @@
#************************************************************
# WL6045:Improve Innochecksum
#************************************************************
--source include/have_innodb.inc
--source include/have_innodb_zip.inc
--source include/innodb_page_size_small.inc
--source include/no_valgrind_without_big.inc
# Embedded server does not support crashing.
--source include/not_embedded.inc

3
mysql-test/suite/innodb_zip/t/innochecksum_2.test
View File

@ -1,8 +1,7 @@
#************************************************************
# WL6045:Improve Innochecksum
#************************************************************
--source include/have_innodb.inc
--source include/have_innodb_zip.inc
--source include/innodb_page_size_small.inc
--source include/have_debug.inc
--source include/no_valgrind_without_big.inc
# Avoid CrashReporter popup on Mac.

3
mysql-test/suite/innodb_zip/t/innochecksum_3.test
View File

@ -1,8 +1,7 @@
#************************************************************
# WL6045:Improve Innochecksum
#************************************************************
--source include/have_innodb.inc
--source include/have_innodb_zip.inc
--source include/innodb_page_size_small.inc
--source include/no_valgrind_without_big.inc

2
mysql-test/suite/innodb_zip/t/innodb-zip.test
View File

@ -1,4 +1,4 @@
-- source include/have_innodb.inc
--source include/innodb_page_size_small.inc
CREATE DATABASE mysqltest_innodb_zip;
USE mysqltest_innodb_zip;

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

@ -1,4 +1,4 @@
--source include/have_innodb.inc
--source include/innodb_page_size_small.inc
#
# Bug#36169 create innodb compressed table with too large row size crashed
# http://bugs.mysql.com/36169

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

@ -1,4 +1,4 @@
--source include/have_innodb.inc
--source include/innodb_page_size_small.inc
#
# Test case for bug 36172
#

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

@ -1,4 +1,4 @@
-- source include/have_innodb.inc
--source include/innodb_page_size_small.inc
SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR
CREATE TABLE bug52745 (

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

@ -1,4 +1,4 @@
-- source include/have_innodb.inc
--source include/innodb_page_size_small.inc
SET GLOBAL innodb_strict_mode=on;
set old_alter_table=0;

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

@ -1,4 +1,4 @@
--source include/have_innodb.inc
--source include/innodb_page_size_small.inc
#
# Bug #56680 InnoDB may return wrong results from a case-insensitive index
#

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

@ -2,6 +2,13 @@
--source include/have_innodb_max_16k.inc
--source include/not_embedded.inc
--disable_query_log
# This test kills the server, which could corrupt some mysql.* tables
# that are not created with ENGINE=InnoDB.
# Flush any non-InnoDB tables to prevent that from happening.
FLUSH TABLES;
--enable_query_log
--echo #
--echo # MDEV-12720 recovery fails with "Generic error"
--echo # for ROW_FORMAT=compressed

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

@ -1,9 +1,7 @@
#
# These test make sure that tables are visible after rebooting
#
--source include/have_innodb.inc
--source include/have_innodb_zip.inc
--source include/innodb_page_size_small.inc
--source include/have_partition.inc
--source include/not_embedded.inc
SET default_storage_engine=InnoDB;

3
mysql-test/suite/innodb_zip/t/wl5522_debug_zip.test
View File

@ -10,8 +10,7 @@
# Avoid CrashReporter popup on Mac
--source include/not_crashrep.inc
-- source include/have_innodb.inc
-- source include/have_innodb_zip.inc
-- source include/innodb_page_size_small.inc
call mtr.add_suppression("InnoDB: Tablespace for table .* is set as discarded.");
call mtr.add_suppression("InnoDB: Cannot calculate statistics for table .* because the .ibd file is missing. Please refer to .* for how to resolve the issue.");

3
mysql-test/suite/innodb_zip/t/wl5522_zip.test
View File

@ -1,8 +1,7 @@
# Not supported in embedded
--source include/not_embedded.inc
-- source include/have_innodb.inc
-- source include/have_innodb_zip.inc
-- source include/innodb_page_size_small.inc
call mtr.add_suppression("InnoDB: Unable to import tablespace .* because it already exists. Please DISCARD the tablespace before IMPORT.");

63
mysql-test/suite/innodb_zip/t/wl6344_compress_level.test
View File

@ -9,31 +9,20 @@
# greater than the
# the size of the table when compression level=9
#*******************************************************************
--source include/have_innodb.inc
--source include/have_innodb_zip.inc
--source include/innodb_page_size_small.inc
USE test;
DROP TABLE IF EXISTS tab5;
DROP TABLE IF EXISTS tab6;
--echo #set the other madatory flags before test starts
SET GLOBAL Innodb_file_per_table=on;
let $innodb_compression_level = `SELECT @@global.innodb_compression_level`;
SET @save_innodb_compression_level = @@global.innodb_compression_level;
--echo #set the compression level=0 (No compress)
SET global innodb_compression_level=0;
-- echo #check the compression level and the compressed_pages is default
SELECT @@innodb_compression_level;
SELECT @@Innodb_file_per_table;
-- echo #create table with 1K block size
CREATE TABLE tab5 (col_1 CHAR (255) ,
col_2 VARCHAR (255), col_3 longtext,
col_4 longtext,col_5 longtext,
col_6 longtext , col_7 longtext ,
col_8 longtext ,col_9 longtext ,
col_10 longtext ,col_11 int auto_increment primary key)
col_10 longtext ,col_11 int auto_increment primary key)
ENGINE = innodb ROW_FORMAT=compressed key_block_size=1;
-- echo #create indexes
@ -56,7 +45,8 @@ SET @col_8 = repeat('h', 100);
SET @col_9 = repeat('i', 100);
SET @col_10 = repeat('j', 100);
--echo #insert 10 records
--echo #insert 10 records
BEGIN;
let $i = 10;
while ($i) {
@ -65,8 +55,9 @@ VALUES (@col_1,@col_2,@col_3,@col_4,@cl_5,@col_6,@col_7,@col_8,@col_9,@col_10);
dec $i;
}
COMMIT;
--echo #set the compression level=9 (High compress)
--echo #set the compression level=9 (High compress)
SET global innodb_compression_level=9;
-- echo #create table with 1K block size
@ -86,19 +77,8 @@ CREATE INDEX idx4 ON tab6(col_7(10));
CREATE INDEX idx5 ON tab6(col_8(10));
CREATE INDEX idx6 ON tab6(col_11);
--echo #load the with repeat function
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_10 = repeat('j', 100);
--echo #insert 10 records
--echo #insert 10 records
BEGIN;
let $i = 10;
while ($i) {
@ -106,30 +86,23 @@ eval INSERT INTO tab6(col_1,col_2,col_3,col_4,col_5,col_6,col_7,col_8,col_9,col_
VALUES (@col_1,@col_2,@col_3,@col_4,@cl_5,@col_6,@col_7,@col_8,@col_9,@col_10);
dec $i;
}
COMMIT;
-- echo #diff the sizes of the No compressed table and high compressed table
SET @size=(SELECT
(SELECT (SUM(DATA_LENGTH+INDEX_LENGTH)/1024/1024)
FROM INFORMATION_SCHEMA.TABLES
SET @size=(SELECT
(SELECT (SUM(DATA_LENGTH+INDEX_LENGTH)/1024/1024)
FROM INFORMATION_SCHEMA.TABLES
WHERE table_name='tab5' AND ENGINE='InnoDB' AND table_schema='test')
-
(SELECT SUM(DATA_LENGTH+INDEX_LENGTH)/1024/1024
FROM INFORMATION_SCHEMA.TABLES
(SELECT SUM(DATA_LENGTH+INDEX_LENGTH)/1024/1024
FROM INFORMATION_SCHEMA.TABLES
WHERE table_name='tab6' AND ENGINE='InnoDB' AND table_schema='test')
FROM DUAL);
--echo #check the size of the table, it should not be Negative value
--echo #check the size of the table, it should not be Negative value
--echo #The results of this query Test pass = 1 and fail=0
SELECT @size >= 0;
DROP TABLE tab5, tab6;
--echo #
--echo # Cleanup
--echo #
DROP TABLE tab5;
DROP TABLE tab6;
--echo #reset back the compression_level to default.
--disable_query_log
eval SET GLOBAL innodb_compression_level=$innodb_compression_level;
--enable_query_log
SET GLOBAL innodb_compression_level = @save_innodb_compression_level;