diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-12 15:10:26 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-12 15:10:26 +0300 |
| commit | 0e7c10445f42af4b61d738034e63303b88bf570f (patch) | |
| tree | 620a4604b76d4dc5951c401d1c4131a79bbfcd3a /mysql-test/suite/federated/my.cnf | |
| parent | 25067ea7e15276dc2c7739015c6a8900805548db (diff) | |
| parent | ad6883c4f2df12fe054d996e3ed32669248bfb08 (diff) | |
| download | mariadb-git-0e7c10445f42af4b61d738034e63303b88bf570f.tar.gz | |
Auto-merge from mysql-trunk.
Diffstat (limited to 'mysql-test/suite/federated/my.cnf')
| -rw-r--r-- | mysql-test/suite/federated/my.cnf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/suite/federated/my.cnf b/mysql-test/suite/federated/my.cnf index 82600949712..67ac440f0df 100644 --- a/mysql-test/suite/federated/my.cnf +++ b/mysql-test/suite/federated/my.cnf @@ -1,5 +1,6 @@ # Use default setting for mysqld processes !include include/default_mysqld.cnf +!include include/default_client.cnf [mysqld.1] log-bin= master-bin |