diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-08-07 21:35:34 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-08-07 21:35:34 +0400 |
| commit | 988a9daa945ce86737397e65757a85213abbb206 (patch) | |
| tree | 4e21eec3dee2d7b87bdd3d6cc00988e98eba59f1 /mysql-test/r/sp.result | |
| parent | 0f1cadd9a5e6e8aa2103100502b0a5b4227e8d7b (diff) | |
| parent | 30c36b2c150d6bf52e56abfbef755119fbc773f9 (diff) | |
| download | mariadb-git-988a9daa945ce86737397e65757a85213abbb206.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
mysql-test/r/func_json.result
mysql-test/r/win.result
mysql-test/t/func_json.test
mysql-test/t/win.test
sql/share/errmsg-utf8.txt
storage/rocksdb/ha_rocksdb.cc
storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_data_index_dir.result
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 71ca5de2990..53626d8013e 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 4068 Unknown VIEW: 'test.tv' +Note 4089 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 4070 At line 5 in test.p1 +Note 4091 At line 5 in test.p1 select * from t1; id 1 |