From 2adb4942e4be292a94db8083731f7534f7d0962b Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 15 Aug 2007 02:18:41 -0600 Subject: [PATCH] Update result formatting for embedded runs of ps_1general and 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. --- mysql-test/t/ps_1general.test | 2 +- mysql-test/t/trigger.test | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mysql-test/t/ps_1general.test b/mysql-test/t/ps_1general.test index 13773504fb0..42bf39890de 100644 --- a/mysql-test/t/ps_1general.test +++ b/mysql-test/t/ps_1general.test @@ -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) ; diff --git a/mysql-test/t/trigger.test b/mysql-test/t/trigger.test index c7251040544..9f4634e1e17 100644 --- a/mysql-test/t/trigger.test +++ b/mysql-test/t/trigger.test @@ -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