diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-21 08:12:19 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-21 08:12:19 +0300 |
| commit | e3d44f5d62672478c40294d6e46d9f066e418cac (patch) | |
| tree | 44b4d1b9d94ced780d4f369f84eddc36791470be /mysql-test/r/sp.result | |
| parent | d176be8aeaecdb20a963fbd126929ddcd5bd98f3 (diff) | |
| parent | f70865bc9e540767d8afc3cc2cbe0e1c92a8c0be (diff) | |
| download | mariadb-git-e3d44f5d62672478c40294d6e46d9f066e418cac.tar.gz | |
Merge bb-10.2-ext into 10.3
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 a1af26cdda0..cb2237699fb 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 4089 Unknown VIEW: 'test.tv' +Note 4090 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 4091 At line 5 in test.p1 +Note 4092 At line 5 in test.p1 select * from t1; id 1 |