Merge with 4.0.21

6 files changed, 17 insertions, 17 deletions

diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh
index 5fdde0d2963..d25686f1c21 100644
--- a/support-files/my-huge.cnf.sh
+++ b/support-files/my-huge.cnf.sh
@@ -1,6 +1,6 @@
-# Example mysql config file for very large systems.
+# Example MySQL config file for very large systems.
 #
-# This is for large system with memory of 1G-2G where the system runs mainly
+# This is for a large system with memory of 1G-2G where the system runs mainly
 # MySQL.
 #
 # You can copy this file to
@@ -9,9 +9,9 @@
 # installation this directory is @localstatedir@) or
 # ~/.my.cnf to set user-specific options.
 #
-# One can in this file use all long options that the program supports.
+# In this file, you can use all long options that a program supports.
 # If you want to know which options a program supports, run the program
-# with the --help option.
+# with the "--help" option.
 
 # The following options will be passed to all MySQL clients
 [client]
diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh
index 54df6a8bfe6..6def311f474 100644
--- a/support-files/my-innodb-heavy-4G.cnf.sh
+++ b/support-files/my-innodb-heavy-4G.cnf.sh
@@ -13,8 +13,8 @@
 # (@localstatedir@ for this installation) or to
 # ~/.my.cnf to set user-specific options.
 #
-# In this file, you can use all long options that the program supports.
-# If you want to know the options a program supports, run the program
+# In this file, you can use all long options that a program supports.
+# If you want to know which options a program supports, run the program
 # with the "--help" option.
 #
 # More detailed information about the individual options can also be
diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh
index a17ec7b5227..59aca4b32f2 100644
--- a/support-files/my-large.cnf.sh
+++ b/support-files/my-large.cnf.sh
@@ -1,6 +1,6 @@
-# Example mysql config file for large systems.
+# Example MySQL config file for large systems.
 #
-# This is for large system with memory = 512M where the system runs mainly
+# This is for a large system with memory = 512M where the system runs mainly
 # MySQL.
 #
 # You can copy this file to
@@ -9,9 +9,9 @@
 # installation this directory is @localstatedir@) or
 # ~/.my.cnf to set user-specific options.
 #
-# One can in this file use all long options that the program supports.
+# In this file, you can use all long options that a program supports.
 # If you want to know which options a program supports, run the program
-# with the --help option.
+# with the "--help" option.
 
 # The following options will be passed to all MySQL clients
 [client]
diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh
index d50d0717c17..529740d59f0 100644
--- a/support-files/my-medium.cnf.sh
+++ b/support-files/my-medium.cnf.sh
@@ -1,4 +1,4 @@
-# Example mysql config file for medium systems.
+# Example MySQL config file for medium systems.
 #
 # This is for a system with little memory (32M - 64M) where MySQL plays
 # an important part, or systems up to 128M where MySQL is used together with
@@ -10,9 +10,9 @@
 # installation this directory is @localstatedir@) or
 # ~/.my.cnf to set user-specific options.
 #
-# One can in this file use all long options that the program supports.
+# In this file, you can use all long options that a program supports.
 # If you want to know which options a program supports, run the program
-# with the --help option.
+# with the "--help" option.
 
 # The following options will be passed to all MySQL clients
 [client]
diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh
index 2ae62fb48f1..b2ecca6127e 100644
--- a/support-files/my-small.cnf.sh
+++ b/support-files/my-small.cnf.sh
@@ -1,4 +1,4 @@
-# Example mysql config file for small systems.
+# Example MySQL config file for small systems.
 #
 # This is for a system with little memory (<= 64M) where MySQL is only used
 # from time to time and it's important that the mysqld daemon
@@ -10,9 +10,9 @@
 # installation this directory is @localstatedir@) or
 # ~/.my.cnf to set user-specific options.
 #
-# One can in this file use all long options that the program supports.
+# In this file, you can use all long options that a program supports.
 # If you want to know which options a program supports, run the program
-# with the --help option.
+# with the "--help" option.
 
 # The following options will be passed to all MySQL clients
 [client]
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 8583b623392..c3d74b147f3 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -397,7 +397,7 @@ useradd -M -r -d $mysql_datadir -s /bin/bash -c "MySQL server" mysql 2> /dev/nul
 chown -R mysql $mysql_datadir
 
 # Initiate databases
-mysql_install_db --rpm
+mysql_install_db -IN-RPM --user=mysql
 
 # Change permissions again to fix any new files.
 chown -R mysql $mysql_datadir