diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2010-01-14 16:50:45 +0000 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2010-01-14 16:50:45 +0000 |
| commit | 3f1899e858fd00bb5edcfedf5b9305e5467a366f (patch) | |
| tree | db02af9680d6dbdff7030e48dbfebb889aea87f4 | |
| parent | dd5d5d32fc48d25383ba765f467de42bb5fd5732 (diff) | |
| download | mariadb-git-3f1899e858fd00bb5edcfedf5b9305e5467a366f.tar.gz | |
Removed garbage from the mysqld--help-win
| -rw-r--r-- | mysql-test/r/mysqld--help-win.result | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/r/mysqld--help-win.result b/mysql-test/r/mysqld--help-win.result index ff882e4459c..7e261fc203c 100644 --- a/mysql-test/r/mysqld--help-win.result +++ b/mysql-test/r/mysqld--help-win.result @@ -993,7 +993,6 @@ use-symbolic-links FALSE verbose TRUE wait-timeout 28800 warnings 1 ->>>>>>> MERGE-SOURCE To see what values a running MySQL server is using, type 'mysqladmin variables' instead of 'mysqld --verbose --help'. |