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 commit '43882e764d6867c6855b1ff057758a3f08b25c55' into 10.4

Browse Source
This commit is contained in:
Alexander Barkov
2019-08-13 11:42:31 +04:00
parent ae1d17f52d 43882e764d
commit 95cdc1ca5f
67 changed files with 986 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,6 +47,8 @@ drop database if exists db1;
create database db1;
use db1;
create table t1 (i int auto_increment, f1 varchar(16), primary key pk (i,f1)) engine=MyISAM;
Warnings:
Warning 1280 Name 'pk' ignored for PRIMARY key.
insert into t1 (f1) values ('one'),('two');
connection slave;
select * from db1.t1;