diff options
author | Alexander Barkov <bar@mariadb.com> | 2019-08-13 11:42:31 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.com> | 2019-08-13 11:42:31 +0400 |
commit | 95cdc1ca5f006965e1b0e53a8567f6dbb87e01a1 (patch) | |
tree | 20f91c9dfc995df26363073737c34e8fe565bfe6 /mysql-test/suite/multi_source | |
parent | ae1d17f52de045b37e0894e1e6684a911a43696c (diff) | |
parent | 43882e764d6867c6855b1ff057758a3f08b25c55 (diff) | |
download | mariadb-git-95cdc1ca5f006965e1b0e53a8567f6dbb87e01a1.tar.gz |
Merge commit '43882e764d6867c6855b1ff057758a3f08b25c55' into 10.4
Diffstat (limited to 'mysql-test/suite/multi_source')
-rw-r--r-- | mysql-test/suite/multi_source/disabled.def | 1 | ||||
-rw-r--r-- | mysql-test/suite/multi_source/multisource.result | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite/multi_source/disabled.def b/mysql-test/suite/multi_source/disabled.def index 45c8a6c8891..e69de29bb2d 100644 --- a/mysql-test/suite/multi_source/disabled.def +++ b/mysql-test/suite/multi_source/disabled.def @@ -1 +0,0 @@ -mdev-8874 : MDEV-20101 Assertion failure diff --git a/mysql-test/suite/multi_source/multisource.result b/mysql-test/suite/multi_source/multisource.result index d99a377f0c5..928c9799854 100644 --- a/mysql-test/suite/multi_source/multisource.result +++ b/mysql-test/suite/multi_source/multisource.result @@ -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; |