Commit 036314d9 authored by unknown's avatar unknown
Browse files

merging 


mysql-test/t/ps_1general.test:
  replace_result fixed
parent e788274b

mysql-test/t/ps_1general.test

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,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) ;