database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint

Browse Source 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint
This commit is contained in:
unknown
2006-06-29 13:49:40 -04:00
parent 801b1afe4d a522b4a860
commit e5d8d9d24d
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/lib/mtr_cases.pl
View File

@ -116,7 +116,7 @@ sub collect_test_cases ($) {
while ( <DISABLED> ) while ( <DISABLED> )
{ {
chomp; chomp;
if ( /^\s*(\S+)\s*:\s*(.*?)\s*$/ ) if ( /^\s*([^\s:]+)\s*:\s*(.*?)\s*$/ )
{ {
$disabled{$1}= $2; $disabled{$1}= $2;
} }

11
scripts/mysqld_safe.sh
View File

@ -321,10 +321,13 @@ then
ulimit -n $open_files ulimit -n $open_files
args="--open-files-limit=$open_files $args" args="--open-files-limit=$open_files $args"
fi fi
if test -n "$core_file_size" fi
then
ulimit -c $core_file_size # Try to set the core file size (even if we aren't root) because many systems
fi # don't specify a hard limit on core file size.
if test -n "$core_file_size"
then
ulimit -c $core_file_size
fi fi
# #