summaryrefslogtreecommitdiff
path: root/mysql-test/r/view.result
diff options
context:
space:
mode:
authorAndrei Elkin <aelkin@mysql.com>2008-11-12 19:51:47 +0200
committerAndrei Elkin <aelkin@mysql.com>2008-11-12 19:51:47 +0200
commitca2d1846950b07115a001a37d84ce63ab2acdc6c (patch)
treeda19273bb9e832fe232c5251aa3f4d9dc29ee7f0 /mysql-test/r/view.result
parent162e550fcf986454cd1a542e98d8adc8fa81fd00 (diff)
parent1d521f6c20881997c9162bd11cadcbc77d20520b (diff)
downloadmariadb-git-ca2d1846950b07115a001a37d84ce63ab2acdc6c.tar.gz
merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging.
mysql_upgrade results changed due to the error messesge of mysqlcheck has changed.
Diffstat (limited to 'mysql-test/r/view.result')
-rw-r--r--mysql-test/r/view.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index 9bea52ef769..322e441154e 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -3672,6 +3672,8 @@ DROP VIEW v1;
# -- End of test case for Bug#35193.
+CREATE VIEW v1 AS SELECT 1;
+DROP VIEW v1;
# -----------------------------------------------------------------
# -- End of 5.0 tests.
# -----------------------------------------------------------------