Skip to content

Commit a763917

Browse files
author
iggy@recycle.(none)
committed
Bug#27144 sp-destruct.test is disabled on Windows
- Update test to run properly on Windows.
1 parent 31b2f33 commit a763917

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

mysql-test/t/sp-destruct.test

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,10 @@
77
# In the case of trouble you might want to skip this.
88
#
99

10-
# We're using --system things that probably doesn't work on Windows.
11-
--source include/not_windows.inc
12-
1310
# Backup proc table
14-
--system rm -rf $MYSQLTEST_VARDIR/master-data/mysql/backup
15-
--system mkdir $MYSQLTEST_VARDIR/master-data/mysql/backup
16-
--system cp $MYSQLTEST_VARDIR/master-data/mysql/proc.* $MYSQLTEST_VARDIR/master-data/mysql/backup/
11+
--copy_file $MYSQLTEST_VARDIR/master-data/mysql/proc.frm $MYSQLTEST_VARDIR/tmp/proc.frm
12+
--copy_file $MYSQLTEST_VARDIR/master-data/mysql/proc.MYD $MYSQLTEST_VARDIR/tmp/proc.MYD
13+
--copy_file $MYSQLTEST_VARDIR/master-data/mysql/proc.MYI $MYSQLTEST_VARDIR/tmp/proc.MYI
1714

1815
use test;
1916

@@ -45,22 +42,25 @@ insert into t1 values (0);
4542
flush table mysql.proc;
4643

4744
# Thrashing the .frm file
48-
--system echo 'saljdlfa' > $MYSQLTEST_VARDIR/master-data/mysql/proc.frm
49-
--replace_result $MYSQLTEST_VARDIR . master-data// ''
45+
--write_file $MYSQLTEST_VARDIR/master-data/mysql/proc.frm
46+
saljdfa
47+
EOF
48+
--replace_result $MYSQLTEST_VARDIR . master-data// '' '\\' '/'
5049
--error ER_NOT_FORM_FILE
5150
call bug14233();
52-
--replace_result $MYSQLTEST_VARDIR . master-data// ''
51+
--replace_result $MYSQLTEST_VARDIR . master-data// '' '\\' '/'
5352
--error ER_NOT_FORM_FILE
5453
create view v1 as select bug14233_f();
55-
--replace_result $MYSQLTEST_VARDIR . master-data// ''
54+
--replace_result $MYSQLTEST_VARDIR . master-data// '' '\\' '/'
5655
--error ER_NOT_FORM_FILE
5756
insert into t1 values (0);
5857

59-
6058
flush table mysql.proc;
6159

6260
# Drop the mysql.proc table
63-
--system rm $MYSQLTEST_VARDIR/master-data/mysql/proc.*
61+
--remove_file $MYSQLTEST_VARDIR/master-data/mysql/proc.frm
62+
--remove_file $MYSQLTEST_VARDIR/master-data/mysql/proc.MYD
63+
--remove_file $MYSQLTEST_VARDIR/master-data/mysql/proc.MYI
6464
--error ER_NO_SUCH_TABLE
6565
call bug14233();
6666
--error ER_NO_SUCH_TABLE
@@ -69,8 +69,12 @@ create view v1 as select bug14233_f();
6969
insert into t1 values (0);
7070

7171
# Restore mysql.proc
72-
--system mv $MYSQLTEST_VARDIR/master-data/mysql/backup/* $MYSQLTEST_VARDIR/master-data/mysql/
73-
--system rmdir $MYSQLTEST_VARDIR/master-data/mysql/backup
72+
--copy_file $MYSQLTEST_VARDIR/tmp/proc.frm $MYSQLTEST_VARDIR/master-data/mysql/proc.frm
73+
--copy_file $MYSQLTEST_VARDIR/tmp/proc.MYD $MYSQLTEST_VARDIR/master-data/mysql/proc.MYD
74+
--copy_file $MYSQLTEST_VARDIR/tmp/proc.MYI $MYSQLTEST_VARDIR/master-data/mysql/proc.MYI
75+
--remove_file $MYSQLTEST_VARDIR/tmp/proc.frm
76+
--remove_file $MYSQLTEST_VARDIR/tmp/proc.MYD
77+
--remove_file $MYSQLTEST_VARDIR/tmp/proc.MYI
7478

7579
flush table mysql.proc;
7680
flush privileges;

0 commit comments

Comments
 (0)