database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge shellback.(none):/home/msvensson/mysql/work/my50-work

Browse Source 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
This commit is contained in:
msvensson@shellback.(none)
2006-09-18 18:04:47 +02:00
parent 6521f20bc1 dafb50055f
commit 8244e4fb73
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/mysql-test-run.pl
View File

@ -1541,7 +1541,8 @@ sub environment_setup () {
my $cmdline_mysql= my $cmdline_mysql=
"$exe_mysql --no-defaults --host=localhost --user=root --password= " . "$exe_mysql --no-defaults --host=localhost --user=root --password= " .
"--port=$master->[0]->{'port'} " . "--port=$master->[0]->{'port'} " .
"--socket=$master->[0]->{'path_sock'}"; "--socket=$master->[0]->{'path_mysock'} ".
"--character-sets-dir=$path_charsetsdir";
$ENV{'MYSQL'}= $cmdline_mysql; $ENV{'MYSQL'}= $cmdline_mysql;
@ -3722,7 +3723,6 @@ sub run_check_testcase ($$) {
sub run_mysqltest ($) { sub run_mysqltest ($) {
my ($tinfo)= @_; my ($tinfo)= @_;
my $exe= $exe_mysqltest; my $exe= $exe_mysqltest;
my $args; my $args;