summaryrefslogtreecommitdiff
path: root/mysql-test/r/commit_1innodb.result
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2017-11-20 11:12:08 +0400
committerAlexander Barkov <bar@mariadb.org>2017-11-20 11:12:08 +0400
commit4a8039b04e60b599b90e1c58021026697272c324 (patch)
treeb8f3d634a95f90b7a496aa3781fb3d9577294964 /mysql-test/r/commit_1innodb.result
parenta0c7d3ff940600aa2d7cff067396ef6985f0bdc4 (diff)
parenta20c1217a5ce4235f72c59935a03b56fead2f6c4 (diff)
downloadmariadb-git-4a8039b04e60b599b90e1c58021026697272c324.tar.gz
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'mysql-test/r/commit_1innodb.result')
-rw-r--r--mysql-test/r/commit_1innodb.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/commit_1innodb.result b/mysql-test/r/commit_1innodb.result
index ade8a4f7549..e57d2ef1dcf 100644
--- a/mysql-test/r/commit_1innodb.result
+++ b/mysql-test/r/commit_1innodb.result
@@ -230,7 +230,7 @@ insert into t2 (a) values (1023);
do (f2(23));
Warnings:
Error 1062 Duplicate entry '23' for key 'a'
-Note 4092 At line 4 in test.f2
+Note 4093 At line 4 in test.f2
select * from t2;
a
1023