diff options
| author | unknown <jimw@mysql.com> | 2005-09-02 12:42:00 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-09-02 12:42:00 -0700 |
| commit | 79ae20bc3a4a4353e1a8b2dd54cbf9eedc2741c4 (patch) | |
| tree | f19bfa5806b4eb963afec8d537624bfb9ade439c /scripts/mysqld_multi.sh | |
| parent | 196862dfd94a749ff703e212dc5b62d19dce451d (diff) | |
| parent | cbb1da77cf096e4746f0a28ec3b6125133cf9c4b (diff) | |
| download | mariadb-git-79ae20bc3a4a4353e1a8b2dd54cbf9eedc2741c4.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/t/variables.test:
Auto merged
sql/set_var.cc:
Auto merged
mysql-test/r/variables.result:
Resolve conflict
scripts/mysqld_multi.sh:
Resolve conflict
Diffstat (limited to 'scripts/mysqld_multi.sh')
| -rw-r--r-- | scripts/mysqld_multi.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index 642772bca44..098cd894916 100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -412,7 +412,12 @@ sub get_mysqladmin_options $mysqladmin_found= 0 if (!length($mysqladmin)); $com = "$mysqladmin"; $tmp = " -u $opt_user"; - $tmp.= defined($opt_password) ? " -p$opt_password" : ""; + if (defined($opt_password)) { + my $pw= $opt_password; + # Protect single quotes in password + $pw =~ s/'/'"'"'/g; + $tmp.= " -p'$pw'"; + } $tmp.= $opt_tcp_ip ? " -h 127.0.0.1" : ""; for ($j = 0; defined($options[$j]); $j++) { |