diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-02-15 14:04:03 -0700 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-02-15 14:04:03 -0700 |
| commit | 25bf1eae6ae033253ea305bd0ea8e1ffac535835 (patch) | |
| tree | 2cc557ce1ce0982d41e97b4574a4db6d03ad0301 /mysql-test/t/ps_1general.test | |
| parent | ae6cc963a7a177fd54c8c55b6b1189d32dd0c324 (diff) | |
| parent | 4f12094fdd942423efb612fff24d0f62e48201d8 (diff) | |
| download | mariadb-git-25bf1eae6ae033253ea305bd0ea8e1ffac535835.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/ps_1general.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/event_data_objects.cc:
Auto merged
sql/event_queue.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysql-test/t/ps_1general.test')
| -rw-r--r-- | mysql-test/t/ps_1general.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/ps_1general.test b/mysql-test/t/ps_1general.test index 5b0118ced49..df3d1f0791c 100644 --- a/mysql-test/t/ps_1general.test +++ b/mysql-test/t/ps_1general.test @@ -575,7 +575,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 \\ / $MYSQL_TEST_DIR . /var/master-data/ "" t7.frm t7 +--replace_result \\ / $MYSQLTEST_VARDIR . /master-data/ "" t7.frm t7 --error 1017 execute stmt1 ; create table t7 (a int) ; |