diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2010-10-10 17:18:11 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2010-10-10 17:18:11 +0300 |
| commit | 72dd7575cd8b9372ddb79cc4c94050e4ee1e5ee1 (patch) | |
| tree | 220c965bb467b020a4db171d7803586f9ed22cea /mysql-test/suite/federated/my.cnf | |
| parent | cfbd9270243e4b429cdc26e8554bcc99690f2422 (diff) | |
| parent | 00a2f36bbf22a4d8b2367724e7919c0603cf6f71 (diff) | |
| download | mariadb-git-72dd7575cd8b9372ddb79cc4c94050e4ee1e5ee1.tar.gz | |
Merge 5.2->5.3
- Re-commit Monty's merge, partially fixed by Igor and SergeyP,
but still broken
Diffstat (limited to 'mysql-test/suite/federated/my.cnf')
| -rw-r--r-- | mysql-test/suite/federated/my.cnf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/suite/federated/my.cnf b/mysql-test/suite/federated/my.cnf index 82600949712..3962c2aca77 100644 --- a/mysql-test/suite/federated/my.cnf +++ b/mysql-test/suite/federated/my.cnf @@ -6,7 +6,6 @@ log-bin= master-bin [mysqld.2] - [ENV] MASTER_MYPORT= @mysqld.1.port MASTER_MYSOCK= @mysqld.1.socket |