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 mysql.com:/home/dlenev/src/mysql-5.0-bg13525

Browse Source 
into  mysql.com:/home/dlenev/src/mysql-5.1-merges2
This commit is contained in:
dlenev@mysql.com
2006-02-27 20:00:07 +03:00
parent 1f30b1525a 3d6839d133
commit 8dbdf5237e
25 changed files with 698 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1156,6 +1156,7 @@ sub environment_setup () {
$ENV{'USE_RUNNING_SERVER'}= $glob_use_running_server;
$ENV{'MYSQL_TEST_DIR'}= $glob_mysql_test_dir;
$ENV{'MYSQLTEST_VARDIR'}= $opt_vardir;
$ENV{'MYSQL_TMP_DIR'}= $opt_tmpdir;
$ENV{'MASTER_MYSOCK'}= $master->[0]->{'path_mysock'};
$ENV{'MASTER_MYSOCK1'}= $master->[1]->{'path_mysock'};
$ENV{'MASTER_MYPORT'}= $master->[0]->{'path_myport'};
@ -2876,7 +2877,7 @@ sub run_mysqltest ($) {
if ( $opt_debug )
{
$cmdline_mysqlcheck .=
" --debug=d:t:A,$opt_vardir_trace/log/mysqldump.trace";
" --debug=d:t:A,$opt_vardir_trace/log/mysqlcheck.trace";
}
my $cmdline_mysqldump= "$exe_mysqldump --no-defaults -uroot " .