summaryrefslogtreecommitdiff
path: root/mysql-test/suite/funcs_1/datadict
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-08-13 19:37:41 +0200
committerSergei Golubchik <serg@mariadb.org>2017-08-14 19:45:59 +0200
commitfa7016cec13f3c7bc5e6111868700d7c3fb49911 (patch)
tree9f757cb6176dc122dbee82f469175be43b2a7ad6 /mysql-test/suite/funcs_1/datadict
parentb2af0ddcf95ade838e67595fd09e9c4a60efbb04 (diff)
downloadmariadb-git-fa7016cec13f3c7bc5e6111868700d7c3fb49911.tar.gz
un-disable a bunch of funcs_1 tests
Diffstat (limited to 'mysql-test/suite/funcs_1/datadict')
-rw-r--r--mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc2
-rw-r--r--mysql-test/suite/funcs_1/datadict/is_tables.inc2
-rw-r--r--mysql-test/suite/funcs_1/datadict/is_triggers.inc2
-rw-r--r--mysql-test/suite/funcs_1/datadict/is_views.inc2
4 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc b/mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc
index cda5144ecc7..71030a2b1d8 100644
--- a/mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc
+++ b/mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc
@@ -322,7 +322,7 @@ if (!$mysql_errno)
INSERT INTO information_schema.key_column_usage
SELECT * FROM information_schema.key_column_usage;
---error ER_DBACCESS_DENIED_ERROR
+--error ER_DBACCESS_DENIED_ERROR,ER_NON_UPDATABLE_TABLE
UPDATE information_schema.key_column_usage
SET table_name = 'db1' WHERE constraint_name = 'primary';
diff --git a/mysql-test/suite/funcs_1/datadict/is_tables.inc b/mysql-test/suite/funcs_1/datadict/is_tables.inc
index de0681d952b..2059917247c 100644
--- a/mysql-test/suite/funcs_1/datadict/is_tables.inc
+++ b/mysql-test/suite/funcs_1/datadict/is_tables.inc
@@ -441,7 +441,7 @@ ENGINE = $engine_type;
INSERT INTO information_schema.tables
SELECT * FROM information_schema.tables;
---error ER_DBACCESS_DENIED_ERROR
+--error ER_DBACCESS_DENIED_ERROR,ER_NON_UPDATABLE_TABLE
UPDATE information_schema.tables SET table_schema = 'test'
WHERE table_name = 't1';
diff --git a/mysql-test/suite/funcs_1/datadict/is_triggers.inc b/mysql-test/suite/funcs_1/datadict/is_triggers.inc
index 82cf6f8e21f..b2ce1e2de00 100644
--- a/mysql-test/suite/funcs_1/datadict/is_triggers.inc
+++ b/mysql-test/suite/funcs_1/datadict/is_triggers.inc
@@ -236,7 +236,7 @@ ON db_datadict.t1 FOR EACH ROW SET @test_before = 2, new.f1 = @test_before;
INSERT INTO information_schema.triggers
SELECT * FROM information_schema.triggers;
---error ER_DBACCESS_DENIED_ERROR
+--error ER_DBACCESS_DENIED_ERROR,ER_NON_UPDATABLE_TABLE
UPDATE information_schema.triggers SET trigger_schema = 'test'
WHERE table_name = 't1';
diff --git a/mysql-test/suite/funcs_1/datadict/is_views.inc b/mysql-test/suite/funcs_1/datadict/is_views.inc
index 3330bea4462..bdba03f3632 100644
--- a/mysql-test/suite/funcs_1/datadict/is_views.inc
+++ b/mysql-test/suite/funcs_1/datadict/is_views.inc
@@ -278,7 +278,7 @@ SELECT * FROM information_schema.views;
INSERT INTO information_schema.views(table_schema, table_name)
VALUES ('db2', 'v2');
---error ER_DBACCESS_DENIED_ERROR
+--error ER_DBACCESS_DENIED_ERROR,ER_NON_UPDATABLE_TABLE
UPDATE information_schema.views SET table_schema = 'test'
WHERE table_name = 't1';