summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2010-02-12 00:54:14 -0200
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2010-02-12 00:54:14 -0200
commit80164ae9a08041e67c65460d9bb2a6b0e1aeb277 (patch)
tree628ef22be817336dec02f9407bfcc26fa378dda6
parent63817720b41a9daa5d792d517c58ae29130cc254 (diff)
downloadmariadb-git-80164ae9a08041e67c65460d9bb2a6b0e1aeb277.tar.gz
Move test case. Embedded server does not support privilege
related bits.
-rw-r--r--mysql-test/r/view.result10
-rw-r--r--mysql-test/r/view_grant.result11
-rw-r--r--mysql-test/t/view.test13
-rw-r--r--mysql-test/t/view_grant.test14
4 files changed, 25 insertions, 23 deletions
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index 70580b82c93..11457e88eb7 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -3845,16 +3845,6 @@ ALTER TABLE v1;
DROP VIEW v1;
DROP TABLE t1;
#
-# Bug#47734: Assertion failed: ! is_set() when locking a view with non-existing definer
-#
-DROP VIEW IF EXISTS v1;
-CREATE DEFINER=`unknown`@`unknown` SQL SECURITY DEFINER VIEW v1 AS SELECT 1;
-Warnings:
-Note 1449 The user specified as a definer ('unknown'@'unknown') does not exist
-LOCK TABLES v1 READ;
-ERROR HY000: The user specified as a definer ('unknown'@'unknown') does not exist
-DROP VIEW v1;
-#
# Bug#48449: hang on show create view after upgrading when
# view contains function of view
#
diff --git a/mysql-test/r/view_grant.result b/mysql-test/r/view_grant.result
index 2d5c515d0b5..52c8bc8a3d5 100644
--- a/mysql-test/r/view_grant.result
+++ b/mysql-test/r/view_grant.result
@@ -1237,3 +1237,14 @@ SELECT a FROM v2;
a
DROP USER mysqluser1;
DROP DATABASE mysqltest1;
+USE test;
+#
+# Bug#47734: Assertion failed: ! is_set() when locking a view with non-existing definer
+#
+DROP VIEW IF EXISTS v1;
+CREATE DEFINER=`unknown`@`unknown` SQL SECURITY DEFINER VIEW v1 AS SELECT 1;
+Warnings:
+Note 1449 The user specified as a definer ('unknown'@'unknown') does not exist
+LOCK TABLES v1 READ;
+ERROR HY000: The user specified as a definer ('unknown'@'unknown') does not exist
+DROP VIEW v1;
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
index 01fa5bc53df..1165c68494b 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@@ -3870,19 +3870,6 @@ DROP VIEW v1;
DROP TABLE t1;
--echo #
---echo # Bug#47734: Assertion failed: ! is_set() when locking a view with non-existing definer
---echo #
-
---disable_warnings
-DROP VIEW IF EXISTS v1;
---enable_warnings
-
-CREATE DEFINER=`unknown`@`unknown` SQL SECURITY DEFINER VIEW v1 AS SELECT 1;
---error ER_NO_SUCH_USER
-LOCK TABLES v1 READ;
-DROP VIEW v1;
-
---echo #
--echo # Bug#48449: hang on show create view after upgrading when
--echo # view contains function of view
--echo #
diff --git a/mysql-test/t/view_grant.test b/mysql-test/t/view_grant.test
index 175468db702..ba603bde7f8 100644
--- a/mysql-test/t/view_grant.test
+++ b/mysql-test/t/view_grant.test
@@ -1532,3 +1532,17 @@ SELECT a FROM v2;
--disconnect mysqluser1
DROP USER mysqluser1;
DROP DATABASE mysqltest1;
+USE test;
+
+--echo #
+--echo # Bug#47734: Assertion failed: ! is_set() when locking a view with non-existing definer
+--echo #
+
+--disable_warnings
+DROP VIEW IF EXISTS v1;
+--enable_warnings
+
+CREATE DEFINER=`unknown`@`unknown` SQL SECURITY DEFINER VIEW v1 AS SELECT 1;
+--error ER_NO_SUCH_USER
+LOCK TABLES v1 READ;
+DROP VIEW v1;