database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-03 14:33:32 +03:00
Code Activity

Merge ymer.(none):/usr/local/mysql/tmp/mysql-5.0-gca

Browse Source 
into  ymer.(none):/usr/local/mysql/tmp/mysql-5.1-new-maint


mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
This commit is contained in:
unknown
2006-11-24 12:40:23 +01:00
parent 5f7b3a8266 66e49e3763
commit 9498bc4e40
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/lib/mtr_io.pl
View File

@@ -13,6 +13,8 @@ sub mtr_tofile ($@);
sub mtr_tonewfile($@); sub mtr_tonewfile($@);
sub mtr_lastlinefromfile($); sub mtr_lastlinefromfile($);
sub mtr_appendfile_to_file ($$); sub mtr_appendfile_to_file ($$);
sub mtr_grab_file($);
############################################################################## ##############################################################################
# #
@@ -128,6 +130,7 @@ sub unspace {
return "$quote$string$quote"; return "$quote$string$quote";
} }
# Read a whole file, stripping leading and trailing whitespace.
sub mtr_fromfile ($) { sub mtr_fromfile ($) {
my $file= shift; my $file= shift;
@@ -181,5 +184,16 @@ sub mtr_appendfile_to_file ($$) {
close TOFILE; close TOFILE;
} }
# Read a whole file verbatim.
sub mtr_grab_file($) {
my $file= shift;
open(FILE, '<', $file)
or return undef;
local $/= undef;
my $data= scalar(<FILE>);
close FILE;
return $data;
}
1; 1;

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

@@ -1603,9 +1603,17 @@ sub environment_setup () {
# impossible to add correct supressions, that means if "/usr/lib/debug" # impossible to add correct supressions, that means if "/usr/lib/debug"
# is available, it should be added to # is available, it should be added to
# LD_LIBRARY_PATH # LD_LIBRARY_PATH
#
# But pthread is broken in libc6-dbg on Debian <= 3.1 (see Debian
# bug 399035, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=399035),
# so don't change LD_LIBRARY_PATH on that platform.
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
my $debug_libraries_path= "/usr/lib/debug"; my $debug_libraries_path= "/usr/lib/debug";
if ( $opt_valgrind and -d $debug_libraries_path ) my $deb_version;
if ( $opt_valgrind and -d $debug_libraries_path and
(! -e '/etc/debian_version' or
($deb_version= mtr_grab_file('/etc/debian_version')) == 0 or
$deb_version > 3.1 ) )
{ {
push(@ld_library_paths, $debug_libraries_path); push(@ld_library_paths, $debug_libraries_path);
} }