diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-04-26 13:59:35 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-04-26 13:59:35 +0300 |
| commit | e0015163515d1fe5d3747c6f859461a30c2ecfd6 (patch) | |
| tree | e8602e5ae53ae2cef06322a338205b501efe8d2a /mysql-test/r/mysqld--help.result | |
| parent | f96fd3f40f37c0080e71e45f85e53bd156aa27f5 (diff) | |
| parent | b6ad03cde9367e4fae45f8d84d8175599fab61e9 (diff) | |
| download | mariadb-git-e0015163515d1fe5d3747c6f859461a30c2ecfd6.tar.gz | |
Merge with mariaDB 5.5.23: bzr merge lp:maria/5.5
Diffstat (limited to 'mysql-test/r/mysqld--help.result')
| -rw-r--r-- | mysql-test/r/mysqld--help.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index f9b64e88f68..fcadee7aced 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -1036,7 +1036,7 @@ replicate-events-marked-for-skip replicate replicate-same-server-id FALSE report-host (No default value) report-password (No default value) -report-port 3306 +report-port 0 report-user (No default value) rowid-merge-buff-size 8388608 rpl-recovery-rank 0 |