diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-11 14:42:05 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-11 14:42:05 +0400 |
| commit | 199f2ce47eb508aa62e9b2fcf80c6536cb14f4f5 (patch) | |
| tree | 4ff089ab16704e50adf007c463d313a7b3013294 /mysql-test/r/mysqld--help-win.result | |
| parent | 456235a13c7e8cb5ba14072ba24ceee5fb877719 (diff) | |
| download | mariadb-git-199f2ce47eb508aa62e9b2fcf80c6536cb14f4f5.tar.gz | |
Some post-merge fixes afer a merge from mysql-5.1-bugteam.
Diffstat (limited to 'mysql-test/r/mysqld--help-win.result')
| -rw-r--r-- | mysql-test/r/mysqld--help-win.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/mysqld--help-win.result b/mysql-test/r/mysqld--help-win.result index ee2bcb51b04..5d517f06add 100644 --- a/mysql-test/r/mysqld--help-win.result +++ b/mysql-test/r/mysqld--help-win.result @@ -907,6 +907,7 @@ shared-memory FALSE shared-memory-base-name MYSQL show-slave-auth-info FALSE skip-grant-tables TRUE +skip-name-resolve FALSE skip-networking FALSE skip-show-database FALSE skip-slave-start FALSE |