summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/.my_sys.h.swpbin16384 -> 0 bytes
-rw-r--r--scripts/mysqlhotcopy.sh1
-rw-r--r--sql-bench/test-create.sh2
-rw-r--r--support-files/mysql.server.sh2
4 files changed, 3 insertions, 2 deletions
diff --git a/include/.my_sys.h.swp b/include/.my_sys.h.swp
deleted file mode 100644
index e9d01f0e65d..00000000000
--- a/include/.my_sys.h.swp
+++ /dev/null
Binary files differ
diff --git a/scripts/mysqlhotcopy.sh b/scripts/mysqlhotcopy.sh
index bc23c0e5d95..b8d4a0a9a38 100644
--- a/scripts/mysqlhotcopy.sh
+++ b/scripts/mysqlhotcopy.sh
@@ -90,6 +90,7 @@ my %opt = (
Getopt::Long::Configure(qw(no_ignore_case)); # disambuguate -p and -P
GetOptions( \%opt,
"help",
+ "host|h=s",
"user|u=s",
"password|p=s",
"port|P=s",
diff --git a/sql-bench/test-create.sh b/sql-bench/test-create.sh
index 2853984e393..1e7d3841bb5 100644
--- a/sql-bench/test-create.sh
+++ b/sql-bench/test-create.sh
@@ -54,7 +54,7 @@ if ($opt_small_test)
}
-print "Testing the speed of creating and droping tables\n";
+print "Testing the speed of creating and dropping tables\n";
print "Testing with $max_tables tables and $opt_loop_count loop count\n\n";
####
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh
index 7493fd29856..139bbb3fd6b 100644
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh
@@ -5,7 +5,7 @@
# Mysql daemon start/stop script.
# Usually this is put in /etc/init.d (at least on machines SYSV R4 based
-# systems) and linked to /etc/rc3.d/S99mysql and /etc/rc0.d/S01mysql.
+# systems) and linked to /etc/rc3.d/S99mysql and /etc/rc0.d/K01mysql.
# When this is done the mysql server will be started when the machine is
# started and shut down when the systems goes down.