mysqlhotcopy.sh:

  Undo serg's patch that used my_print_defaults,
  and instead simply do not define $opt{user}.
  This allows the script to use option files properly.
parent fe399f74
...@@ -81,13 +81,11 @@ sub usage { ...@@ -81,13 +81,11 @@ sub usage {
die @_, $OPTIONS; die @_, $OPTIONS;
} }
# reading ~/.my.cnf # Do not initialize user or password options; that way, any user/password
my @defops = `@bindir@/my_print_defaults client mysqlhotcopy`; # options specified in option files will be used. If no values are specified
chop @defops; # all, the defaults will be used (login name, no password).
splice @ARGV, 0, 0, @defops;
my %opt = ( my %opt = (
user => scalar getpwuid($>),
noindices => 0, noindices => 0,
allowold => 0, # for safety allowold => 0, # for safety
keepold => 0, keepold => 0,
...@@ -170,6 +168,9 @@ $dsn = ";host=" . (defined($opt{host}) ? $opt{host} : "localhost"); ...@@ -170,6 +168,9 @@ $dsn = ";host=" . (defined($opt{host}) ? $opt{host} : "localhost");
$dsn .= ";port=$opt{port}" if $opt{port}; $dsn .= ";port=$opt{port}" if $opt{port};
$dsn .= ";mysql_socket=$opt{socket}" if $opt{socket}; $dsn .= ";mysql_socket=$opt{socket}" if $opt{socket};
# use mysql_read_default_group=mysqlhotcopy so that [client] and
# [mysqlhotcopy] groups will be read from standard options files.
my $dbh = DBI->connect("dbi:mysql:$dsn;mysql_read_default_group=mysqlhotcopy", my $dbh = DBI->connect("dbi:mysql:$dsn;mysql_read_default_group=mysqlhotcopy",
$opt{user}, $opt{password}, $opt{user}, $opt{password},
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment