diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-06 17:16:40 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-06 17:16:40 +0300 |
commit | 4081b7b27a40df6244e0525885cf70e48b7b35bc (patch) | |
tree | e9e6199730603d05090e0550e023e92c7a32f88d /mysql-test/main/information_schema.test | |
parent | 780d2bb8a7eca4fdbdf70fbd51c0bdbae5b0057e (diff) | |
parent | 244f0e6dd815b388282c15db4fe7f15533f4c8fc (diff) | |
download | mariadb-git-4081b7b27a40df6244e0525885cf70e48b7b35bc.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/main/information_schema.test')
-rw-r--r-- | mysql-test/main/information_schema.test | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/main/information_schema.test b/mysql-test/main/information_schema.test index 95b6f253058..dc0ad5cff59 100644 --- a/mysql-test/main/information_schema.test +++ b/mysql-test/main/information_schema.test @@ -17,6 +17,9 @@ # Save the initial number of concurrent sessions --source include/count_sessions.inc +--source include/default_optimizer_switch.inc +--source include/default_charset.inc + set global sql_mode=""; set local sql_mode=""; |