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

Fix merge conflicts

Browse Source
This commit is contained in:
msvensson@neptunus.(none)
2006-11-24 13:39:09 +01:00
parent 86f0d1bb03
commit 7d8c8af5a2
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,7 +187,6 @@ our $opt_fast;
our $opt_force; our $opt_force;
our $opt_reorder= 0; our $opt_reorder= 0;
our $opt_enable_disabled; our $opt_enable_disabled;
our $opt_report_features;
our $opt_mem= $ENV{'MTR_MEM'}; our $opt_mem= $ENV{'MTR_MEM'};
our $opt_gcov; our $opt_gcov;
@ -656,7 +655,7 @@ sub command_line_setup () {
# directory. And we install "/usr/share/mysql-test". Moving up one # directory. And we install "/usr/share/mysql-test". Moving up one
# more directory relative to "mysql-test" gives us a usable base # more directory relative to "mysql-test" gives us a usable base
# directory for RPM installs. # directory for RPM installs.
if ( ! $opt_source_dist and ! -d "$glob_basedir/bin" ) if ( ! $source_dist and ! -d "$glob_basedir/bin" )
{ {
$glob_basedir= dirname($glob_basedir); $glob_basedir= dirname($glob_basedir);
} }