diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-12 13:26:57 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-12 13:27:16 +0200 |
commit | ccf22b80259e4e8976e28408b5b04e2914234827 (patch) | |
tree | ecd99c0543083a772623fe920563d682aa5978a6 /mysql-test/r/sp.result | |
parent | a285e68018018ef3959f6381aa61347b73902997 (diff) | |
download | mariadb-git-ccf22b80259e4e8976e28408b5b04e2914234827.tar.gz |
Post-merge fix: Adjust message codes in results
Diffstat (limited to 'mysql-test/r/sp.result')
-rw-r--r-- | mysql-test/r/sp.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index f40e6033b9f..527ea81c67e 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -3211,7 +3211,7 @@ drop procedure bug10961| DROP PROCEDURE IF EXISTS bug6866| DROP VIEW IF EXISTS tv| Warnings: -Note 4091 Unknown VIEW: 'test.tv' +Note 4092 Unknown VIEW: 'test.tv' DROP TABLE IF EXISTS tt1,tt2,tt3| Warnings: Note 1051 Unknown table 'test.tt1' @@ -7823,7 +7823,7 @@ ERROR 23000: Duplicate entry '2' for key 'PRIMARY' show warnings; Level Code Message Error 1062 Duplicate entry '2' for key 'PRIMARY' -Note 4093 At line 5 in test.p1 +Note 4094 At line 5 in test.p1 select * from t1; id 1 |