Update result formatting for embedded runs of ps_1general and

trigger tests, to match build_table_filename behavior.
This commit is contained in:
tsmith@ramayana.hindu.god 2007-08-15 02:18:41 -06:00
parent fa9bacb25c
commit badc34bd81
2 changed files with 3 additions and 2 deletions

View file

@ -577,7 +577,7 @@ prepare stmt1 from ' rename table t5 to t6, t7 to t8 ' ;
create table t5 (a int) ;
# rename must fail, t7 does not exist
# Clean up the filename here because embedded server reports whole path
--replace_result \\ / $MYSQLTEST_VARDIR . /master-data/ "" t7.frm t7
--replace_result $MYSQLTEST_VARDIR . master-data/ '' t7.frm t7
--error 1017
execute stmt1 ;
create table t7 (a int) ;

View file

@ -1146,7 +1146,8 @@ write_file $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
dummy
EOF
chmod 0000 $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
--replace_result $MYSQLTEST_VARDIR . master-data// ''
# Normalize the datadir path; the embedded server doesn't chdir to datadir
--replace_result $MYSQLTEST_VARDIR . master-data/ ''
--error 1
rename table t1 to t2;
# 't1' should be still there and triggers should work correctly