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/r/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/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 f05f5105aa7..3891423f53e 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 4090 Unknown VIEW: 'test.tv' +Note 4091 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 4092 At line 5 in test.p1 +Note 4093 At line 5 in test.p1 select * from t1; id 1 |