diff options
author | Magnus Blåudd <magnus.blaudd@sun.com> | 2010-03-15 14:57:20 +0100 |
---|---|---|
committer | Magnus Blåudd <magnus.blaudd@sun.com> | 2010-03-15 14:57:20 +0100 |
commit | fda5004d3699bf7c670d55675a0a4a316460752e (patch) | |
tree | 9cdbce1b6e74f2a90802745ae5993d24ea3c3a3e /mysql-test/include | |
parent | 27bb4377c673d2a5a756dfd1b61dbbd2f0213d2d (diff) | |
parent | 04e99c10096e9cfe72f9823fc73b9f4eee80c1db (diff) | |
download | mariadb-git-fda5004d3699bf7c670d55675a0a4a316460752e.tar.gz |
Merge in fix for bug#42589
Diffstat (limited to 'mysql-test/include')
-rw-r--r-- | mysql-test/include/default_my.cnf | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/mysql-test/include/default_my.cnf b/mysql-test/include/default_my.cnf index 6888a69b0a4..83c67638d4e 100644 --- a/mysql-test/include/default_my.cnf +++ b/mysql-test/include/default_my.cnf @@ -30,14 +30,6 @@ loose-enable-performance-schema [mysqlbinlog] disable-force-if-open -# mysql_fix_privilege_tables.sh does not read from [client] so it -# need its own section -[mysql_fix_privilege_tables] -socket= @client.socket -port= @client.port -user= @client.user -password= @client.password - [ENV] MASTER_MYPORT= @mysqld.1.port MASTER_MYSOCK= @mysqld.1.socket |