diff options
| author | unknown <msvensson@pilot.(none)> | 2007-08-07 11:42:14 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-08-07 11:42:14 +0200 |
| commit | d513e1ef50c580954f49c2230259a4647379c2fd (patch) | |
| tree | 0bad5fb4b1dc6128c97876c40451ad1fe3ad9ccf /mysql-test/t/sp-destruct.test | |
| parent | d3b0bed19730892300bbc6fa7f6c1ebceadfc67d (diff) | |
| parent | 04e8c93c20a5517cfd57ef71ea91a3cea531828b (diff) | |
| download | mariadb-git-d513e1ef50c580954f49c2230259a4647379c2fd.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/mysqladmin.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/sp-destruct.test:
Auto merged
client/mysqltest.c:
Manual merge
Diffstat (limited to 'mysql-test/t/sp-destruct.test')
| -rw-r--r-- | mysql-test/t/sp-destruct.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/sp-destruct.test b/mysql-test/t/sp-destruct.test index 04a581ab45f..56d99c4435c 100644 --- a/mysql-test/t/sp-destruct.test +++ b/mysql-test/t/sp-destruct.test @@ -50,6 +50,7 @@ insert into t1 values (0); flush table mysql.proc; # Thrashing the .frm file +--remove_file $MYSQLTEST_VARDIR/master-data/mysql/proc.frm --write_file $MYSQLTEST_VARDIR/master-data/mysql/proc.frm saljdfa EOF |