diff options
| author | unknown <serg@sergbook.mysql.com> | 2003-02-10 14:56:30 +0100 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2003-02-10 14:56:30 +0100 |
| commit | 1846f7320abd08d28552ae0fbcb2b5d86719972b (patch) | |
| tree | e05f911353baf9881b79d15c204e8fadcad21c19 /scripts | |
| parent | 7910884c5cbb59e89041506a12b9a3a567a97067 (diff) | |
| parent | 556bb7bb3d98188d2243fd39b09e7cd4cfc7bfd2 (diff) | |
| download | mariadb-git-1846f7320abd08d28552ae0fbcb2b5d86719972b.tar.gz | |
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
Build-tools/Do-compile:
Auto merged
bdb/dist/configure.in:
Auto merged
scripts/mysqlhotcopy.sh:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysqlaccess.sh | 4 | ||||
| -rw-r--r-- | scripts/mysqlhotcopy.sh | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/scripts/mysqlaccess.sh b/scripts/mysqlaccess.sh index 824dba7b65a..699e74834e3 100644 --- a/scripts/mysqlaccess.sh +++ b/scripts/mysqlaccess.sh @@ -2414,7 +2414,7 @@ sub Print_Header { sub Print_Footer { if ($MySQLaccess::CMD) { #command-line mode print "\n" - ."BUGs can be reported by email to Yves.Carlier\@rug.ac.be\n"; + ."BUGs can be reported by email to bugs\@mysql.com\n"; } if ($MySQLaccess::CGI) { #CGI-BIN mode if ($MySQLaccess::Param{'brief'}) { @@ -2422,7 +2422,7 @@ sub Print_Footer { } print "<HR>\n" ."<ADDRESS>\n" - ."BUGs can be reported by email to <a href=mailto:Yves.Carlier\@rug.ac.be>Yves.Carlier\@rug.ac.be</a><BR>\n" + ."BUGs can be reported by email to <a href=mailto:bugs\@mysql.com>bugs\@mysql.com</a><BR>\n" # ."Don't forget to mention the version $VERSION!<BR>\n" ."</ADDRESS>\n" ."</BODY>\n" diff --git a/scripts/mysqlhotcopy.sh b/scripts/mysqlhotcopy.sh index b8d4a0a9a38..1a694247461 100644 --- a/scripts/mysqlhotcopy.sh +++ b/scripts/mysqlhotcopy.sh @@ -49,8 +49,9 @@ 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 - -h, --host=# Hostname for local server when connecting over TCP/IP + -p, --password=# password to use when connecting to server (if not set + in my.cnf, which is recommended) + -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 @@ -893,7 +894,11 @@ user for database login if not current user =item -p, --password=# -password to use when connecting to server +password to use when connecting to the server. Note that you are strongly +encouraged *not* to use this option as every user would be able to see the +password in the process list. Instead use the '[mysqlhotcopy]' section in +one of the config files, normally /etc/my.cnf or your personal ~/.my.cnf. +(See the chapter 'my.cnf Option Files' in the manual) =item -h, -h, --host=# |