diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-21 07:58:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-21 07:58:08 +0300 |
| commit | 72a802421781d7bcab80c5f98f21f1747c54d36f (patch) | |
| tree | 8afc057437e4c08ec847e4af0ea050400195b458 /mysql-test/suite/rpl/r/rpl_sp.result | |
| parent | 625951cb2873746059c3bce543d22421eb7766f5 (diff) | |
| download | mariadb-git-72a802421781d7bcab80c5f98f21f1747c54d36f.tar.gz | |
After-merge fix: Adjust some results.
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 25287b70cf6..2849e5b7ae3 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 4091 At line 4 in mysqltest1.foo4 +Note 4092 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 4091 At line 3 in mysqltest1.fn1 +Note 4092 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' |