diff options
author | serg@serg.mysql.com <> | 2000-12-08 19:12:12 +0100 |
---|---|---|
committer | serg@serg.mysql.com <> | 2000-12-08 19:12:12 +0100 |
commit | 9de654911fe6a5dd0bac38480157b756154f30f3 (patch) | |
tree | b3cf47fdde3aa352b8b52e36e980f8c9740dc2e1 | |
parent | 3afbfc2b75223bbd292b2c0be4e12912c5578f62 (diff) | |
download | mariadb-git-9de654911fe6a5dd0bac38480157b756154f30f3.tar.gz |
mysqldump.c typo fixed
mysqldumpslow.sh | first line should be #!@PERL@
mysqld_multi.sh | not #@perl@ or #!/usr/bin/perl
-rw-r--r-- | client/mysqldump.c | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | scripts/mysqld_multi.sh | 24 | ||||
-rw-r--r--[-rwxr-xr-x] | scripts/mysqldumpslow.sh | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 019069d81b0..ac9aed87022 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -599,7 +599,7 @@ static uint getTableStructure(char *table, char* db) sprintf(insert_pat,"SET OPTION SQL_QUOTE_SHOW_CREATE=%d", opt_quoted); table_name=quote_name(table,table_buff); - if (mysql_query(sock,insert_pat)) + if (!mysql_query(sock,insert_pat)) { /* using SHOW CREATE statement */ if (!tFlag) diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index cd8609d9409..634f71b41d3 100755..100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!@PERL@ use Getopt::Long; use POSIX qw(strftime); @@ -82,11 +82,11 @@ sub main print "in your PATH.\n"; exit(1); } - usage() if (!defined($ARGV[0]) || + usage() if (!defined($ARGV[0]) || ($ARGV[0] ne 'start' && $ARGV[0] ne 'START' && $ARGV[0] ne 'stop' && $ARGV[0] ne 'STOP' && $ARGV[0] ne 'report' && $ARGV[0] ne 'REPORT')); - + if (!$opt_no_log) { w2log("$my_progname log file version $VER; run: ", @@ -213,7 +213,7 @@ sub start_mysqlds() } if (!$i && !$opt_no_log) { - w2log("No MySQL servers to be started (check your GNRs)", + w2log("No MySQL servers to be started (check your GNRs)", "$opt_log", 0, 0); } } @@ -261,7 +261,7 @@ sub stop_mysqlds() } if (!$i && !$opt_no_log) { - w2log("No MySQL servers to be stopped (check your GNRs)", + w2log("No MySQL servers to be stopped (check your GNRs)", "$opt_log", 0, 0); } } @@ -373,7 +373,7 @@ sub find_groups } #### -#### w2log: Write to a logfile. +#### w2log: Write to a logfile. #### 1.arg: append to the log file (given string, or from a file. if a file, #### file will be read from $opt_logdir) #### 2.arg: logfile -name (w2log assumes that the logfile is in $opt_logdir). @@ -392,8 +392,8 @@ sub w2log if ($is_file) { - open (FROMFILE, "<$msg") && (@data=<FROMFILE>) && - close(FROMFILE) + open (FROMFILE, "<$msg") && (@data=<FROMFILE>) && + close(FROMFILE) or die "FATAL: w2log: Couldn't open file: $msg\n"; foreach my $line (@data) { @@ -401,7 +401,7 @@ sub w2log } } else - { + { print LOGFILE "$msg"; print LOGFILE strftime "%a %b %e %H:%M:%S %Y", localtime if ($date_flag); print LOGFILE "\n"; @@ -443,13 +443,13 @@ sub example # This is an example of a my.cnf file on behalf of $my_progname. # This file should probably be in your home dir (~/.my.cnf) or /etc/my.cnf # Version $VER by Jani Tolonen -# NOTES: +# NOTES: # 1.Make sure that the MySQL user, who is stopping the mysqld services (e.g # using the mysqladmin) have the same password and username for all the # data directories accessed (to the 'mysql' database) And make sure that # the user has the 'Shutdown_priv' privilege! If you have many data- # directories and many different 'mysql' databases with different passwords -# for the MySQL 'root' user, you may want to create a common 'multi_admin' +# for the MySQL 'root' user, you may want to create a common 'multi_admin' # user for each using the same password (see below). Example how to do it: # shell> mysql -u root -S /tmp/mysql.sock -proot_password -e # "GRANT SHUTDOWN ON *.* TO multi_admin\@localhost IDENTIFIED BY 'multipass'" @@ -493,7 +493,7 @@ sub example # account for this, unless you *KNOW* what you are doing! # 8.MOST IMPORTANT: Make sure that you understand the meanings of the options # that are passed to the mysqlds and why *WOULD YOU WANT* to have separate -# mysqld processes. Starting multiple mysqlds in one data directory *WON'T* +# mysqld processes. Starting multiple mysqlds in one data directory *WON'T* # give you extra performance in a threaded system! # [mysqld_multi] diff --git a/scripts/mysqldumpslow.sh b/scripts/mysqldumpslow.sh index c2c88005c80..b0e63dd73c1 100755..100644 --- a/scripts/mysqldumpslow.sh +++ b/scripts/mysqldumpslow.sh @@ -1,4 +1,4 @@ -#@perl@ +#!@PERL@ # mysqldumpslow - parse and summarize the MySQL slow query log use strict; |