database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2019-06-19 10:49:00 +03:00
parent efbfcc8b73 192aa295b4
commit 02979daab4
76 changed files with 4013 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1324
mysql-test/suite/compat/oracle/r/column_compression.result
View File

File diff suppressed because it is too large Load Diff

26
mysql-test/suite/compat/oracle/r/keywords.result Normal file
View File

@ -0,0 +1,26 @@
SET sql_mode=ORACLE;
#
# MDEV-17363 Compressed columns cannot be restored from dump
# In sql_mode=ORACLE, COMPRESSED is still valid both as an SP label
# and an SP variable name.
#
BEGIN
IF TRUE THEN
GOTO compressed;
END IF;
SELECT 'This should not be reached' AS warn;
<<compressed>>
BEGIN
SELECT 1 AS a;
END;
END
$$
a
1
DECLARE compressed INT DEFAULT 1;
BEGIN
SELECT compressed;
END
$$
compressed
1

38
mysql-test/suite/compat/oracle/r/mysqldump_restore.result Normal file
View File

@ -0,0 +1,38 @@
SET sql_mode=ORACLE;
#
# Start of 10.3 tests
#
#
# MDEV-17363 Compressed columns cannot be restored from dump
#
CREATE TABLE t1 (a VARCHAR(1000) COMPRESSED CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL);
INSERT INTO `t1` VALUES (REPEAT('a', 256));
# Begin testing mysqldump output + restore
# Create 'original table name - <table>_orig
SET @orig_table_name = CONCAT('test.t1', '_orig');
# Rename original table
ALTER TABLE test.t1 RENAME to test.t1_orig;
# Recreate table from mysqldump output
# Compare original and recreated tables
# Recreated table: test.t1
# Original table: test.t1_orig
include/diff_tables.inc [test.t1, test.t1_orig]
# Cleanup
DROP TABLE test.t1, test.t1_orig;
CREATE TABLE t1 (a LONGTEXT COMPRESSED CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL);
INSERT INTO `t1` VALUES (REPEAT('a', 256));
# Begin testing mysqldump output + restore
# Create 'original table name - <table>_orig
SET @orig_table_name = CONCAT('test.t1', '_orig');
# Rename original table
ALTER TABLE test.t1 RENAME to test.t1_orig;
# Recreate table from mysqldump output
# Compare original and recreated tables
# Recreated table: test.t1
# Original table: test.t1_orig
include/diff_tables.inc [test.t1, test.t1_orig]
# Cleanup
DROP TABLE test.t1, test.t1_orig;
#
# End of 10.3 tests
#