mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge recycle.(none):/src/bug27144/my50-bug27144

Browse source 
into  recycle.(none):/src/bug27144/my51-bug27144


mysql-test/t/sp-destruct.test:
  SCCS merged
This commit is contained in:
unknown 2007-03-21 14:01:39 -04:00
commit 9e6d54e4a5
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
mysql-test/t/sp-destruct.test
View file

@ -12,13 +12,10 @@
# mysqltest should be fixed to allow REPLACE_RESULT in error message # mysqltest should be fixed to allow REPLACE_RESULT in error message
-- source include/not_embedded.inc -- source include/not_embedded.inc
# We're using --system things that probably doesn't work on Windows.
--source include/not_windows.inc
# Backup proc table # Backup proc table
--system rm -rf $MYSQLTEST_VARDIR/master-data/mysql/backup --copy_file $MYSQLTEST_VARDIR/master-data/mysql/proc.frm $MYSQLTEST_VARDIR/tmp/proc.frm
--system mkdir $MYSQLTEST_VARDIR/master-data/mysql/backup --copy_file $MYSQLTEST_VARDIR/master-data/mysql/proc.MYD $MYSQLTEST_VARDIR/tmp/proc.MYD
--system cp $MYSQLTEST_VARDIR/master-data/mysql/proc.* $MYSQLTEST_VARDIR/master-data/mysql/backup/ --copy_file $MYSQLTEST_VARDIR/master-data/mysql/proc.MYI $MYSQLTEST_VARDIR/tmp/proc.MYI
use test; use test;
@ -53,22 +50,25 @@ insert into t1 values (0);
flush table mysql.proc; flush table mysql.proc;
# Thrashing the .frm file # Thrashing the .frm file
--system echo 'saljdlfa' > $MYSQLTEST_VARDIR/master-data/mysql/proc.frm --write_file $MYSQLTEST_VARDIR/master-data/mysql/proc.frm
--replace_result $MYSQLTEST_VARDIR . master-data// '' saljdfa
EOF
--replace_result $MYSQLTEST_VARDIR . master-data// '' '\\' '/'
--error ER_NOT_FORM_FILE --error ER_NOT_FORM_FILE
call bug14233(); call bug14233();
--replace_result $MYSQLTEST_VARDIR . master-data// '' --replace_result $MYSQLTEST_VARDIR . master-data// '' '\\' '/'
--error ER_NOT_FORM_FILE --error ER_NOT_FORM_FILE
create view v1 as select bug14233_f(); create view v1 as select bug14233_f();
--replace_result $MYSQLTEST_VARDIR . master-data// '' --replace_result $MYSQLTEST_VARDIR . master-data// '' '\\' '/'
--error ER_NOT_FORM_FILE --error ER_NOT_FORM_FILE
insert into t1 values (0); insert into t1 values (0);
flush table mysql.proc; flush table mysql.proc;
# Drop the mysql.proc table # Drop the mysql.proc table
--system rm $MYSQLTEST_VARDIR/master-data/mysql/proc.* --remove_file $MYSQLTEST_VARDIR/master-data/mysql/proc.frm
--remove_file $MYSQLTEST_VARDIR/master-data/mysql/proc.MYD
--remove_file $MYSQLTEST_VARDIR/master-data/mysql/proc.MYI
--error ER_NO_SUCH_TABLE --error ER_NO_SUCH_TABLE
call bug14233(); call bug14233();
--error ER_NO_SUCH_TABLE --error ER_NO_SUCH_TABLE
@ -77,8 +77,12 @@ create view v1 as select bug14233_f();
insert into t1 values (0); insert into t1 values (0);
# Restore mysql.proc # Restore mysql.proc
--system mv $MYSQLTEST_VARDIR/master-data/mysql/backup/* $MYSQLTEST_VARDIR/master-data/mysql/ --copy_file $MYSQLTEST_VARDIR/tmp/proc.frm $MYSQLTEST_VARDIR/master-data/mysql/proc.frm
--system rmdir $MYSQLTEST_VARDIR/master-data/mysql/backup --copy_file $MYSQLTEST_VARDIR/tmp/proc.MYD $MYSQLTEST_VARDIR/master-data/mysql/proc.MYD
--copy_file $MYSQLTEST_VARDIR/tmp/proc.MYI $MYSQLTEST_VARDIR/master-data/mysql/proc.MYI
--remove_file $MYSQLTEST_VARDIR/tmp/proc.frm
--remove_file $MYSQLTEST_VARDIR/tmp/proc.MYD
--remove_file $MYSQLTEST_VARDIR/tmp/proc.MYI
flush table mysql.proc; flush table mysql.proc;
flush privileges; flush privileges;