database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2017-09-19 12:43:02 +03:00
parent 7d49aab32c ec6042bda0
commit 22c322c649
68 changed files with 1358 additions and 839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mysql-test/suite/rpl/r/rpl_sp_variables.result Normal file
View File

@@ -0,0 +1,24 @@
include/master-slave.inc
[connection master]
#
# MDEV-13685 Can not replay binary log due to Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb4_general_ci,COERCIBLE) for operation 'concat'
#
SET NAMES utf8;
CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf8);
CREATE PROCEDURE p1()
BEGIN
DECLARE v_id INT DEFAULT 2017;
INSERT INTO test.t1 SELECT CONCAT(v_id, '오');
END;
$$
CALL p1;
SELECT * FROM t1;
a
2017오
SET NAMES utf8;
SELECT * FROM t1;
a
2017오
DROP PROCEDURE p1;
DROP TABLE t1;
include/rpl_end.inc

28
mysql-test/suite/rpl/t/rpl_sp_variables.test Normal file
View File

@@ -0,0 +1,28 @@
source include/master-slave.inc;
--echo #
--echo # MDEV-13685 Can not replay binary log due to Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb4_general_ci,COERCIBLE) for operation 'concat'
--echo #
connection master;
SET NAMES utf8;
CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf8);
DELIMITER $$;
CREATE PROCEDURE p1()
BEGIN
DECLARE v_id INT DEFAULT 2017;
INSERT INTO test.t1 SELECT CONCAT(v_id, '오');
END;
$$
DELIMITER ;$$
CALL p1;
SELECT * FROM t1;
sync_slave_with_master;
SET NAMES utf8;
SELECT * FROM t1;
connection master;
DROP PROCEDURE p1;
DROP TABLE t1;
sync_slave_with_master;
--source include/rpl_end.inc