7
7
# In the case of trouble you might want to skip this.
8
8
#
9
9
10
- # We're using --system things that probably doesn't work on Windows.
11
- --source include/not_windows.inc
12
-
13
10
# 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
17
14
18
15
use test;
19
16
@@ -45,22 +42,25 @@ insert into t1 values (0);
45
42
flush table mysql.proc;
46
43
47
44
# 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// '' '\\' '/'
50
49
--error ER_NOT_FORM_FILE
51
50
call bug14233();
52
- --replace_result $MYSQLTEST_VARDIR . master-data// ''
51
+ --replace_result $MYSQLTEST_VARDIR . master-data// '' '\\' '/'
53
52
--error ER_NOT_FORM_FILE
54
53
create view v1 as select bug14233_f();
55
- --replace_result $MYSQLTEST_VARDIR . master-data// ''
54
+ --replace_result $MYSQLTEST_VARDIR . master-data// '' '\\' '/'
56
55
--error ER_NOT_FORM_FILE
57
56
insert into t1 values (0);
58
57
59
-
60
58
flush table mysql.proc;
61
59
62
60
# 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
64
64
--error ER_NO_SUCH_TABLE
65
65
call bug14233();
66
66
--error ER_NO_SUCH_TABLE
@@ -69,8 +69,12 @@ create view v1 as select bug14233_f();
69
69
insert into t1 values (0);
70
70
71
71
# 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
74
78
75
79
flush table mysql.proc;
76
80
flush privileges;
0 commit comments