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/view.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/view.result')
| -rw-r--r-- | mysql-test/r/view.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index ef2e0935592..a09856c77a4 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -5236,7 +5236,7 @@ CREATE TABLE t4 (i4 INT); INSERT INTO t4 VALUES (1),(2); DROP VIEW IF EXISTS v1; Warnings: -Note 4068 Unknown VIEW: 'test.v1' +Note 4089 Unknown VIEW: 'test.v1' CREATE VIEW v1 AS select coalesce(j1,i3) AS v1_field1 from t2 join t3 left join t1 on ( i1 = i2 ); CREATE VIEW v2 AS select v1_field1 from t4 join v1; prepare my_stmt from "select v1_field1 from v2"; |