diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-08-06 16:12:52 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-08-06 16:12:52 +0300 |
| commit | 72345f2b474310bc72af7fb4e3b25c7051dfd6cd (patch) | |
| tree | ec56e69057df802b4810a80947eb79d8ffdd2a99 /scripts/mysqlhotcopy.sh | |
| parent | 4c1712e40171e2861359878ea885e14936298acf (diff) | |
| download | mariadb-git-72345f2b474310bc72af7fb4e3b25c7051dfd6cd.tar.gz | |
Better error messages for mysql-test-run
Added option --host to mysqlhotcopy
mysql-test/mysql-test-run.sh:
Added error message if the server doesn't start.
Increase connect timeout a bit (for running under purify).
mysql-test/t/rpl000001.test:
Longer sleep time (for running under purify)
scripts/mysqlhotcopy.sh:
Added option --host for usage with TCP/IP connections
sql/gen_lex_hash.cc:
Fixed typo
Diffstat (limited to 'scripts/mysqlhotcopy.sh')
| -rw-r--r-- | scripts/mysqlhotcopy.sh | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/scripts/mysqlhotcopy.sh b/scripts/mysqlhotcopy.sh index 707b4fc481c..1aad5c95c25 100644 --- a/scripts/mysqlhotcopy.sh +++ b/scripts/mysqlhotcopy.sh @@ -50,7 +50,8 @@ Usage: $0 db_name[./table_regex/] [new_db_name | directory] -?, --help display this helpscreen and exit -u, --user=# user for database login if not current user -p, --password=# password to use when connecting to server - -P, --port=# port to use when connecting to local server + -h, --host=# Hostname for local server when connecting over TCP/IP + -P, --port=# port to use when connecting to local server with TCP/IP -S, --socket=# socket to use when connecting to local server --allowold don\'t abort if target already exists (rename it _old) @@ -155,8 +156,8 @@ $opt{quiet} = 0 if $opt{debug}; $opt{allowold} = 1 if $opt{keepold}; # --- connect to the database --- -my $dsn = ";host=localhost"; -$dsn = ";host=127.0.0.1" if $opt{port}; # use TCP/IP if port was given +my $dsn; +$dsn = ";host=" . (defined($opt{host}) ? $opt{host} : "localhost"); $dsn .= ";port=$opt{port}" if $opt{port}; $dsn .= ";mysql_socket=$opt{socket}" if $opt{socket}; @@ -891,9 +892,15 @@ user for database login if not current user password to use when connecting to server +=item -h, -h, --host=# + +Hostname for local server when connecting over TCP/IP. By specifying this +different from 'localhost' will trigger mysqlhotcopy to use TCP/IP connection. + =item -P, --port=# -port to use when connecting to local server +port to use when connecting to MySQL server with TCP/IP. This is only used +when using the --host option. =item -S, --socket=# |