summaryrefslogtreecommitdiff
path: root/mysql-test/suite/binlog
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-08-12 18:23:42 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-08-12 18:25:35 +0300
commitbe33124c9dc284c4409d02e5405de568b467a167 (patch)
tree7188f6effdace66ce24af17fd1bd0d89f5b76999 /mysql-test/suite/binlog
parentfe8181aca13cf7ba1835fa6c89f297a1d0e79856 (diff)
parent15c1ab52a9f2827724c5d007ce7b8c607dc8f0a9 (diff)
downloadmariadb-git-be33124c9dc284c4409d02e5405de568b467a167.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/suite/binlog')
-rw-r--r--mysql-test/suite/binlog/r/binlog_unsafe.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_unsafe.result b/mysql-test/suite/binlog/r/binlog_unsafe.result
index 2c8ed93b5b5..cc341fad196 100644
--- a/mysql-test/suite/binlog/r/binlog_unsafe.result
+++ b/mysql-test/suite/binlog/r/binlog_unsafe.result
@@ -2710,6 +2710,8 @@ Warnings:
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. CREATE... REPLACE SELECT is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are replaced. This order cannot be predicted and may differ on master and the slave
INSERT INTO insert_2_keys VALUES (1, 2)
ON DUPLICATE KEY UPDATE a=VALUES(a)+10, b=VALUES(b)+10;
+Warnings:
+Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. INSERT... ON DUPLICATE KEY UPDATE on a table with more than one UNIQUE KEY is unsafe
DROP TABLE filler_table;
DROP TABLE insert_table;
DROP TABLE update_table;