diff options
| author | monty@hundin.mysql.fi <> | 2001-08-11 01:42:34 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-08-11 01:42:34 +0300 |
| commit | 79131084c8367f85bb9be83d0cf8fd76526ed30f (patch) | |
| tree | cccf6b1dc41e678eddad6f48981bf82d6b935148 | |
| parent | 65a711f40f8b64246cd4a18745552bc22e621f23 (diff) | |
| download | mariadb-git-79131084c8367f85bb9be83d0cf8fd76526ed30f.tar.gz | |
Fixed handling of strings in mysqldumpslow
| -rw-r--r-- | scripts/mysqldumpslow.sh | 5 | ||||
| -rw-r--r-- | sql/mysqlbinlog.cc | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/scripts/mysqldumpslow.sh b/scripts/mysqldumpslow.sh index 02b5d5cd0cd..856c8a09b5e 100644 --- a/scripts/mysqldumpslow.sh +++ b/scripts/mysqldumpslow.sh @@ -3,6 +3,7 @@ # Original version by Tim Bunce, sometime in 2000. # Further changes by Tim Bunce, 8th March 2001. +# Handling of strings with \ and double '' by Monty 11 Aug 2001. use strict; use Getopt::Long; @@ -95,8 +96,8 @@ while ( defined($_ = shift @pending) or defined($_ = <>) ) { unless ($opt{a}) { s/\b\d+\b/N/g; s/\b0x[0-9A-Fa-f]+\b/N/g; - s/'.*?'/'S'/g; - s/".*?"/"S"/g; + s/'([^\\\']|\\.|\'\')+'/'S'/g; + s/"([^\\\"]|\\.|\"\")+"/"S"/g; # -n=8: turn log_20001231 into log_NNNNNNNN s/([a-z_]+)(\d{$opt{n},})/$1.('N' x length($2))/ieg if $opt{n}; # abbreviate massive "in (...)" statements and similar diff --git a/sql/mysqlbinlog.cc b/sql/mysqlbinlog.cc index 5edfe6e0591..c2ea73008e1 100644 --- a/sql/mysqlbinlog.cc +++ b/sql/mysqlbinlog.cc @@ -108,7 +108,7 @@ static void die(const char* fmt, ...) static void print_version() { - printf("%s Ver 1.4 for %s at %s\n",my_progname,SYSTEM_TYPE, MACHINE_TYPE); + printf("%s Ver 1.5 for %s at %s\n",my_progname,SYSTEM_TYPE, MACHINE_TYPE); } @@ -133,7 +133,7 @@ the mysql command line client\n\n"); -o, --offset=N Skip the first N entries\n\ -h, --host=server Get the binlog from server\n\ -P, --port=port Use port to connect to the remote server\n\ --u, --user=username Connect to the remove server as username\n\ +-u, --user=username Connect to the remote server as username\n\ -p, --password=password Password to connect to remote server\n\ -r, --result-file=file Direct output to a given file\n\ -j, --position=N Start reading the binlog at position N\n\ |