summaryrefslogtreecommitdiff
path: root/mysql-test/t/trigger.test
diff options
context:
space:
mode:
authorunknown <tsmith@ramayana.hindu.god>2007-08-15 02:18:41 -0600
committerunknown <tsmith@ramayana.hindu.god>2007-08-15 02:18:41 -0600
commit2adb4942e4be292a94db8083731f7534f7d0962b (patch)
treea9ca0b23139cebb15447d12fc978f065b308954b /mysql-test/t/trigger.test
parent3925c3feee67aaf1efeb08610b68b5c360b955b7 (diff)
downloadmariadb-git-2adb4942e4be292a94db8083731f7534f7d0962b.tar.gz
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.
Diffstat (limited to 'mysql-test/t/trigger.test')
-rw-r--r--mysql-test/t/trigger.test3
1 files changed, 2 insertions, 1 deletions
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