diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-09-06 11:53:10 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-09-06 11:53:10 +0200 |
| commit | 244f0e6dd815b388282c15db4fe7f15533f4c8fc (patch) | |
| tree | af138f2b3739a742c0c38173cdc86ec176fc0edd /mysql-test/suite/roles | |
| parent | 18af13b88ba580562981a190c25da128a2e9db26 (diff) | |
| parent | 2842c369851a8afc2a944ce6f4f60fa052f20969 (diff) | |
| download | mariadb-git-244f0e6dd815b388282c15db4fe7f15533f4c8fc.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'mysql-test/suite/roles')
| -rw-r--r-- | mysql-test/suite/roles/acl_statistics.opt | 1 | ||||
| -rw-r--r-- | mysql-test/suite/roles/definer.test | 4 | ||||
| -rw-r--r-- | mysql-test/suite/roles/show_create_database-10463.test | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/suite/roles/acl_statistics.opt b/mysql-test/suite/roles/acl_statistics.opt new file mode 100644 index 00000000000..24307596e69 --- /dev/null +++ b/mysql-test/suite/roles/acl_statistics.opt @@ -0,0 +1 @@ +--disable-skip-name-resolve diff --git a/mysql-test/suite/roles/definer.test b/mysql-test/suite/roles/definer.test index 16d23386741..c1e56f3f94b 100644 --- a/mysql-test/suite/roles/definer.test +++ b/mysql-test/suite/roles/definer.test @@ -4,7 +4,9 @@ # create event # mysqldump dumping the definer -source include/not_embedded.inc; +--source include/not_embedded.inc +--source include/default_charset.inc + let MYSQLD_DATADIR=`select @@datadir`; create database mysqltest1; diff --git a/mysql-test/suite/roles/show_create_database-10463.test b/mysql-test/suite/roles/show_create_database-10463.test index 6278cc71c02..b1eaaf5ff5a 100644 --- a/mysql-test/suite/roles/show_create_database-10463.test +++ b/mysql-test/suite/roles/show_create_database-10463.test @@ -1,4 +1,5 @@ -source include/not_embedded.inc; +--source include/not_embedded.inc +--source include/default_charset.inc drop database if exists db; |