Skip to content

Commit 031e426

Browse files
kboortzkboortz
committed
Merge from mysql-5.5 to mysql-5.6
2 parents 56c75d1 + bd7e5ab commit 031e426

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

‎scripts/mysql_install_db.pl.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ Usage: $0 [OPTIONS]
9494
Read this file after the global files are read.
9595
--defaults-file=name Only read default options from the given file name.
9696
--force Causes mysql_install_db to run even if DNS does not
97-
work. In that case, grant table entries that normally
98-
use hostnames will use IP addresses.
97+
work. In that case, grant table entries that
98+
normally use hostnames will use IP addresses.
9999
--help Display this help and exit.
100100
--ldata=path The path to the MySQL data directory. Same as --datadir.
101101
--no-defaults Don't read default options from any option file.

‎scripts/mysql_install_db.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ Usage: $0 [OPTIONS]
4949
Read this file after the global files are read.
5050
--defaults-file=name Only read default options from the given file name.
5151
--force Causes mysql_install_db to run even if DNS does not
52-
work. In that case, grant table entries that normally
53-
use hostnames will use IP addresses.
52+
work. In that case, grant table entries that
53+
normally use hostnames will use IP addresses.
5454
--help Display this help and exit.
5555
--ldata=path The path to the MySQL data directory. Same as --datadir.
5656
--no-defaults Don't read default options from any option file.

0 commit comments

Comments
 (0)