diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-11-20 11:12:08 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-11-20 11:12:08 +0400 |
| commit | 4a8039b04e60b599b90e1c58021026697272c324 (patch) | |
| tree | b8f3d634a95f90b7a496aa3781fb3d9577294964 /mysql-test/suite/rpl/r/rpl_sp.result | |
| parent | a0c7d3ff940600aa2d7cff067396ef6985f0bdc4 (diff) | |
| parent | a20c1217a5ce4235f72c59935a03b56fead2f6c4 (diff) | |
| download | mariadb-git-4a8039b04e60b599b90e1c58021026697272c324.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_sp.result')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_sp.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_sp.result b/mysql-test/suite/rpl/r/rpl_sp.result index 2849e5b7ae3..fbd81cb7146 100644 --- a/mysql-test/suite/rpl/r/rpl_sp.result +++ b/mysql-test/suite/rpl/r/rpl_sp.result @@ -128,7 +128,7 @@ show warnings; Level Code Message Error 1062 Duplicate entry '20' for key 'a' Warning 1196 Some non-transactional changed tables couldn't be rolled back -Note 4092 At line 4 in mysqltest1.foo4 +Note 4093 At line 4 in mysqltest1.foo4 select * from t2; a 20 @@ -291,7 +291,7 @@ end| do fn1(100); Warnings: Error 1062 Duplicate entry '100' for key 'a' -Note 4092 At line 3 in mysqltest1.fn1 +Note 4093 At line 3 in mysqltest1.fn1 Warning 1196 Some non-transactional changed tables couldn't be rolled back select fn1(20); ERROR 23000: Duplicate entry '20' for key 'a' |