Commit 40a43b55 authored by holyfoot/hf@mysql.com/hfmain.(none)'s avatar holyfoot/hf@mysql.com/hfmain.(none)
Browse files

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  mysql.com:/home/hf/work/25973/my50-25973
parents aeaf6d3c 91f68837

mysql-test/t/ps_1general.test

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