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

MDEV-11953: support of brackets in UNION/EXCEPT/INTERSECT operations

Browse Source
This commit is contained in:
Oleksandr Byelkin
2018-05-22 19:08:39 +02:00
parent 1b981b9edb
commit de745ecf29
298 changed files with 36118 additions and 3473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/binlog_encryption/rpl_corruption.result
View File

@ -53,6 +53,10 @@ include/start_slave.inc
connection master;
connection slave;
include/diff_tables.inc [master:test.t1, slave:test.t1]
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
# 8. Clean up
connection master;
SET GLOBAL debug_dbug= "";

4
mysql-test/suite/binlog_encryption/rpl_loadfile.result
View File

@ -244,6 +244,10 @@ include/start_slave.inc
connection master;
connection slave;
include/diff_tables.inc [master:t1, slave:t1]
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
connection master;
DROP TABLE t1;
DROP PROCEDURE p;

28
mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.result
View File

@ -23,6 +23,10 @@ include/wait_for_slave_sql_error_and_skip.inc [errno=1590]
Got one of the listed errors
include/wait_for_slave_sql_error_and_skip.inc [errno=1590]
include/diff_tables.inc [master:t1,slave:t1]
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
########################################################################################
# 2 - BEGIN - IMPLICIT COMMIT by DDL
########################################################################################
@ -55,6 +59,10 @@ INSERT INTO t1 (a, data) VALUES (29, 's');;
CREATE TABLE t5 (a int);
connection slave;
include/diff_tables.inc [master:t1,slave:t1]
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
########################################################################################
# 3 - BEGIN - COMMIT
########################################################################################
@ -69,6 +77,10 @@ Got one of the listed errors
COMMIT;
connection slave;
include/diff_tables.inc [master:t1,slave:t1]
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
########################################################################################
# 4 - BEGIN - ROLLBACK
########################################################################################
@ -85,6 +97,10 @@ Warnings:
Warning 1196 Some non-transactional changed tables couldn't be rolled back
connection slave;
include/diff_tables.inc [master:t1,slave:t1]
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
########################################################################################
# 5 - PROCEDURE
########################################################################################
@ -111,6 +127,10 @@ Got one of the listed errors
ROLLBACK;
connection slave;
include/diff_tables.inc [master:t1,slave:t1]
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
########################################################################################
# 6 - XID
########################################################################################
@ -131,6 +151,10 @@ Warning 1196 Some non-transactional changed tables couldn't be rolled back
COMMIT;
connection slave;
include/diff_tables.inc [master:t1,slave:t1]
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
########################################################################################
# 7 - NON-TRANS TABLE
########################################################################################
@ -152,6 +176,10 @@ Got one of the listed errors
COMMIT;
connection slave;
include/diff_tables.inc [master:t1,slave:t1]
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
########################################################################
# 8 - Bug#55375(Regression Bug) Transaction bigger than
# max_binlog_cache_size crashes slave

4
mysql-test/suite/binlog_encryption/rpl_special_charset.result
View File

@ -5,6 +5,10 @@ CREATE TABLE t1(i VARCHAR(20));
INSERT INTO t1 VALUES (0xFFFF);
connection slave;
include/diff_tables.inc [master:t1, slave:t1]
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
connection master;
DROP TABLE t1;
include/rpl_end.inc

4
mysql-test/suite/binlog_encryption/rpl_stm_relay_ign_space.result
View File

@ -2,5 +2,9 @@ include/master-slave.inc
[connection master]
include/assert.inc [Assert that relay log space is close to the limit]
include/diff_tables.inc [master:test.t1,slave:test.t1]
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
connection slave;
include/rpl_end.inc

8
mysql-test/suite/binlog_encryption/rpl_sync.result
View File

@ -29,6 +29,10 @@ include/start_slave.inc
connection master;
connection slave;
include/diff_tables.inc [master:t1,slave:t1]
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
=====Corrupting the master.info=======;
connection slave;
include/stop_slave.inc
@ -47,6 +51,10 @@ include/start_slave.inc
connection master;
connection slave;
include/diff_tables.inc [master:t1,slave:t1]
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
=====Clean up=======;
connection master;
drop table t1;