mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merge branch '10.11' into 11.0
This commit is contained in:
@@ -3085,8 +3085,10 @@ eval SHOW CREATE VIEW test1.v$level;
|
||||
# the following line as written as '--eror ER_TOO_MANY_TABLES' and the command
|
||||
# is successful so assuming no expected error was intended
|
||||
# --error ER_TOO_MANY_TABLES
|
||||
--disable_ps2_protocol
|
||||
eval SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
|
||||
CAST(f2 AS CHAR) AS f2 FROM test1.v$level;
|
||||
--enable_ps2_protocol
|
||||
let $message= The output of following EXPLAIN is deactivated, because the result
|
||||
differs on some platforms
|
||||
FIXME Is this a bug ? ;
|
||||
@@ -3116,16 +3118,20 @@ SELECT f1 as f2, f2 as f1 FROM test2.t1;
|
||||
CREATE OR REPLACE VIEW test2.v0 AS
|
||||
SELECT CAST('0001-01-01' AS DATE) as f1, f2 FROM test3.t1;
|
||||
eval SHOW CREATE VIEW test1.v$toplevel;
|
||||
--disable_ps2_protocol
|
||||
eval SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
|
||||
CAST(f2 AS CHAR) AS f2 FROM test1.v$toplevel;
|
||||
--enable_ps2_protocol
|
||||
eval EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
|
||||
CAST(f2 AS CHAR) AS f2 FROM test1.v$toplevel;
|
||||
# 2.3.3 UCS2 string instead of common string
|
||||
CREATE OR REPLACE VIEW test3.v0 AS
|
||||
SELECT f1 , CONVERT('ßÄäÖöÜü§' USING UCS2) as f2 FROM test1.t1;
|
||||
eval SHOW CREATE VIEW test1.v$toplevel;
|
||||
--disable_ps2_protocol
|
||||
eval SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
|
||||
CAST(f2 AS CHAR) AS f2 FROM test1.v$toplevel;
|
||||
--enable_ps2_protocol
|
||||
eval EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
|
||||
CAST(f2 AS CHAR) AS f2 FROM test1.v$toplevel;
|
||||
|
||||
@@ -3133,8 +3139,10 @@ eval EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
|
||||
CREATE OR REPLACE VIEW test3.v0 AS
|
||||
SELECT CONVERT('ßÄäÖöÜü§' USING UCS2) as f1, f2 FROM test1.t1;
|
||||
eval SHOW CREATE VIEW test1.v$toplevel;
|
||||
--disable_ps2_protocol
|
||||
eval SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
|
||||
CAST(f2 AS CHAR) AS f2 FROM test1.v$toplevel;
|
||||
--enable_ps2_protocol
|
||||
eval EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
|
||||
CAST(f2 AS CHAR) AS f2 FROM test1.v$toplevel;
|
||||
--enable_result_log
|
||||
|
@@ -6,6 +6,11 @@ connection slave;
|
||||
include/stop_slave.inc
|
||||
CHANGE MASTER TO MASTER_USE_GTID=NO;
|
||||
include/start_slave.inc
|
||||
connection master;
|
||||
# Ensure only the new binlog dump thread is alive (wait for the old one
|
||||
# to complete its kill)
|
||||
# And that it has already sent its fake rotate
|
||||
connection slave;
|
||||
include/stop_slave.inc
|
||||
# Test slave with no capability gets dummy event, which is ignored.
|
||||
set @old_dbug= @@global.debug_dbug;
|
||||
|
@@ -18,6 +18,17 @@ sync_slave_with_master;
|
||||
CHANGE MASTER TO MASTER_USE_GTID=NO;
|
||||
--source include/start_slave.inc
|
||||
|
||||
--connection master
|
||||
--echo # Ensure only the new binlog dump thread is alive (wait for the old one
|
||||
--echo # to complete its kill)
|
||||
--let $wait_condition= select count(*)=1 from information_schema.processlist where command='Binlog Dump'
|
||||
--source include/wait_condition.inc
|
||||
|
||||
--echo # And that it has already sent its fake rotate
|
||||
--let $wait_condition= select count(*)=1 from information_schema.processlist where state LIKE '%Master has sent all binlog to slave%' and command='Binlog Dump'
|
||||
--source include/wait_condition.inc
|
||||
|
||||
--connection slave
|
||||
--source include/stop_slave.inc
|
||||
--echo # Test slave with no capability gets dummy event, which is ignored.
|
||||
set @old_dbug= @@global.debug_dbug;
|
||||
|
Reference in New Issue
Block a user