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

Merge branch 'bb-10.2-serg-merge' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2017-02-11 09:45:34 +01:00
parent 5593458062 2195bb4e41
commit f3914d10b6
219 changed files with 11142 additions and 2970 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
include/master-slave.inc
[connection master]
call mtr.add_suppression("Cannot use utf16 as character_set_client");
call mtr.add_suppression("'utf16' can not be used as client character set");
CREATE TABLE t1(i VARCHAR(20));
INSERT INTO t1 VALUES (0xFFFF);
connection slave;