diff options
| author | Monty <monty@mariadb.org> | 2019-09-02 14:06:56 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-09-03 13:17:32 +0300 |
| commit | a071e0e029cd7c155cff1054d9f7f8a6aa898620 (patch) | |
| tree | b592c10cb8ca3036688ea19039208eadd485fe7c /mysql-test/main/ps-master.opt | |
| parent | b0ff5a6a7393c057cd201aff63279e45d3e0cc49 (diff) | |
| parent | 9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (diff) | |
| download | mariadb-git-a071e0e029cd7c155cff1054d9f7f8a6aa898620.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/ps-master.opt')
| -rw-r--r-- | mysql-test/main/ps-master.opt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/ps-master.opt b/mysql-test/main/ps-master.opt index 2ae67eedad8..0fa6f43b7ef 100644 --- a/mysql-test/main/ps-master.opt +++ b/mysql-test/main/ps-master.opt @@ -1 +1 @@ ---log-output=table,file --slow-query-log --log-queries-not-using-indexes --general-log +--log-output=table,file --slow-query-log --log-queries-not-using-indexes --general-log --character-set-server=latin1 --collation_server=latin1_swedish_ci --sql_mode=STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION |