1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0

Browse Source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/parse_file.cc:
  Auto merged
This commit is contained in:
unknown 2006-03-23 08:22:11 +01:00
commit 47cee5bf9a
3 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2333,11 +2333,32 @@ sub save_installed_db () {
} }
} }
#
# Save any interesting files in the data_dir
# before the data dir is removed.
#
sub save_files_before_restore($$) {
my $test_name= shift;
my $data_dir= shift;
my $save_name= "$opt_vardir/log/$test_name";
# Look for core files
foreach my $core_file ( glob("$data_dir/core*") )
{
my $core_name= basename($core_file);
mtr_report("Saving $core_name");
mkdir($save_name) if ! -d $save_name;
rename("$core_file", "$save_name/$core_name");
}
}
# #
# Restore snapshot of the installed test db(s) # Restore snapshot of the installed test db(s)
# if the snapshot exists # if the snapshot exists
# #
sub restore_installed_db () { sub restore_installed_db ($) {
my $test_name= shift;
if ( -d $path_snapshot) if ( -d $path_snapshot)
{ {
@ -2348,6 +2369,7 @@ sub restore_installed_db () {
foreach my $data_dir (@data_dir_lst) foreach my $data_dir (@data_dir_lst)
{ {
my $name= basename($data_dir); my $name= basename($data_dir);
save_files_before_restore($test_name, $data_dir);
rmtree("$data_dir"); rmtree("$data_dir");
copy_dir("$path_snapshot/$name", "$data_dir"); copy_dir("$path_snapshot/$name", "$data_dir");
} }
@ -2381,7 +2403,7 @@ sub report_failure_and_restart ($) {
if ( $opt_force ) if ( $opt_force )
{ {
# Restore the snapshot of the installed test db # Restore the snapshot of the installed test db
restore_installed_db(); restore_installed_db($tinfo->{'name'});
print "Resuming Tests\n\n"; print "Resuming Tests\n\n";
return; return;
} }

13
mysql-test/t/type_newdecimal.test
View File

@ -1054,14 +1054,7 @@ SELECT my_float, my_double, my_varchar FROM t1;
# On windows we get 0.000000000011754943372854770000 # On windows we get 0.000000000011754943372854770000
# use replace_result to correct it # use replace_result to correct it
--replace_result 0.000000000011754943372854770000 0.000000000011754943372854760000 --replace_result 0.000000000011754943372854770000 0.000000000011754943372854760000
SELECT CAST(my_float AS DECIMAL(65,30)), my_float FROM t1; SELECT CAST(my_float AS DECIMAL(65,30)), my_float FROM t1;
# Expected result 0.000000000011754943372854760000
# On windows we get 0.000000000011754943372854770000
# use replace_result to correct it
--replace_result 0.000000000011754943372854770000 0.000000000011754943372854760000
SELECT CAST(my_double AS DECIMAL(65,30)), my_double FROM t1; SELECT CAST(my_double AS DECIMAL(65,30)), my_double FROM t1;
SELECT CAST(my_varchar AS DECIMAL(65,30)), my_varchar FROM t1; SELECT CAST(my_varchar AS DECIMAL(65,30)), my_varchar FROM t1;
@ -1072,7 +1065,13 @@ SELECT CAST(my_varchar AS DECIMAL(65,30)), my_varchar FROM t1;
--disable_warnings --disable_warnings
UPDATE t1 SET my_decimal = my_float; UPDATE t1 SET my_decimal = my_float;
# Expected result 0.000000000011754943372854760000
# On windows we get 0.000000000011754943372854770000
# use replace_result to correct it
--replace_result 0.000000000011754943372854770000 0.000000000011754943372854760000
SELECT my_decimal, my_float FROM t1; SELECT my_decimal, my_float FROM t1;
UPDATE t1 SET my_decimal = my_double; UPDATE t1 SET my_decimal = my_double;
SELECT my_decimal, my_double FROM t1; SELECT my_decimal, my_double FROM t1;
--enable_warnings --enable_warnings

1
sql/parse_file.cc
View File

@ -759,7 +759,6 @@ File_parser::parse(gptr base, MEM_ROOT *mem_root,
char *eol; char *eol;
LEX_STRING *str; LEX_STRING *str;
List<LEX_STRING> *list; List<LEX_STRING> *list;
ulonglong *num;
DBUG_ENTER("File_parser::parse"); DBUG_ENTER("File_parser::parse");
while (ptr < end && found < required) while (ptr < end && found < required)