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

Update result formatting for embedded runs of ps_1general and

Browse Source 
trigger tests, to match build_table_filename behavior.


mysql-test/t/ps_1general.test:
  Adjust how the datadir file name is normalized, to match new
  build_table_filename behavior.  This fixes the test result
  when run with the embedded server.
mysql-test/t/trigger.test:
  Adjust how the datadir file name is normalized, to match new
  build_table_filename behavior.  This fixes the test result
  when run with the embedded server.
This commit is contained in:
unknown
2007-08-15 02:18:41 -06:00
parent 3925c3feee
commit 2adb4942e4
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/t/ps_1general.test
View File

@@ -577,7 +577,7 @@ prepare stmt1 from ' rename table t5 to t6, t7 to t8 ' ;
create table t5 (a int) ; create table t5 (a int) ;
# rename must fail, t7 does not exist # rename must fail, t7 does not exist
# Clean up the filename here because embedded server reports whole path # 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 --error 1017
execute stmt1 ; execute stmt1 ;
create table t7 (a int) ; create table t7 (a int) ;

3
mysql-test/t/trigger.test
View File

@@ -1146,7 +1146,8 @@ write_file $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
dummy dummy
EOF EOF
chmod 0000 $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~; 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 --error 1
rename table t1 to t2; rename table t1 to t2;
# 't1' should be still there and triggers should work correctly # 't1' should be still there and triggers should work correctly