Follow-up for patch that addresses bug #53976 "ALTER TABLE

RENAME is allowed on views (not documented, broken)".

Adjusted test cases in funcs_1 suite after removing support
of ALTER TABLE RENAME for views.

5 files changed, 5 insertions, 1 deletions

diff --git a/mysql-test/suite/funcs_1/r/innodb_views.result b/mysql-test/suite/funcs_1/r/innodb_views.result
index b4bce0b0d1b..86a61773a31 100644
--- a/mysql-test/suite/funcs_1/r/innodb_views.result
+++ b/mysql-test/suite/funcs_1/r/innodb_views.result
@@ -3521,6 +3521,7 @@ RENAME TABLE v1 TO v2;
 RENAME VIEW  v2 TO v1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VIEW  v2 TO v1' at line 1
 ALTER TABLE v2 RENAME AS v1;
+ERROR HY000: 'test.v2' is not BASE TABLE
 ALTER VIEW  v1 RENAME AS v2;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RENAME AS v2' at line 1
 DROP TABLE IF EXISTS t1, t2 ;
diff --git a/mysql-test/suite/funcs_1/r/memory_views.result b/mysql-test/suite/funcs_1/r/memory_views.result
index 2f7342088f8..7ed23c3a5c1 100644
--- a/mysql-test/suite/funcs_1/r/memory_views.result
+++ b/mysql-test/suite/funcs_1/r/memory_views.result
@@ -3522,6 +3522,7 @@ RENAME TABLE v1 TO v2;
 RENAME VIEW  v2 TO v1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VIEW  v2 TO v1' at line 1
 ALTER TABLE v2 RENAME AS v1;
+ERROR HY000: 'test.v2' is not BASE TABLE
 ALTER VIEW  v1 RENAME AS v2;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RENAME AS v2' at line 1
 DROP TABLE IF EXISTS t1, t2 ;
diff --git a/mysql-test/suite/funcs_1/r/myisam_views.result b/mysql-test/suite/funcs_1/r/myisam_views.result
index b77ea8a4bd9..ca4dba9f337 100644
--- a/mysql-test/suite/funcs_1/r/myisam_views.result
+++ b/mysql-test/suite/funcs_1/r/myisam_views.result
@@ -4024,6 +4024,7 @@ RENAME TABLE v1 TO v2;
 RENAME VIEW  v2 TO v1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VIEW  v2 TO v1' at line 1
 ALTER TABLE v2 RENAME AS v1;
+ERROR HY000: 'test.v2' is not BASE TABLE
 ALTER VIEW  v1 RENAME AS v2;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RENAME AS v2' at line 1
 DROP TABLE IF EXISTS t1, t2 ;
diff --git a/mysql-test/suite/funcs_1/r/ndb_views.result b/mysql-test/suite/funcs_1/r/ndb_views.result
index 10cb7613f47..6c5a10845a0 100644
--- a/mysql-test/suite/funcs_1/r/ndb_views.result
+++ b/mysql-test/suite/funcs_1/r/ndb_views.result
@@ -3521,6 +3521,7 @@ RENAME TABLE v1 TO v2;
 RENAME VIEW  v2 TO v1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VIEW  v2 TO v1' at line 1
 ALTER TABLE v2 RENAME AS v1;
+ERROR HY000: 'test.v2' is not BASE TABLE
 ALTER VIEW  v1 RENAME AS v2;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RENAME AS v2' at line 1
 DROP TABLE IF EXISTS t1, t2 ;
diff --git a/mysql-test/suite/funcs_1/views/views_master.inc b/mysql-test/suite/funcs_1/views/views_master.inc
index 4f8439efc3a..906f1f03b3b 100644
--- a/mysql-test/suite/funcs_1/views/views_master.inc
+++ b/mysql-test/suite/funcs_1/views/views_master.inc
@@ -298,7 +298,7 @@ RENAME TABLE v1 TO v2;
 # RENAME VIEW is not available even when we try it via rename table.
 --error ER_PARSE_ERROR
 RENAME VIEW  v2 TO v1;
-#--error ER_WRONG_OBJECT
+--error ER_WRONG_OBJECT
 ALTER TABLE v2 RENAME AS v1;
 --error ER_PARSE_ERROR
 ALTER VIEW  v1 RENAME AS v2;