diff options
| author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-07-14 16:26:58 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-07-14 16:26:58 +0500 |
| commit | 39f9adfa849a9763dd883fd4661eb9ddfb47d576 (patch) | |
| tree | 9741bdd736d6a09ae7e8bbcab977f7ebbc1efd73 /mysql-test/t/warnings-master.opt | |
| parent | 1787072458f518c68b940f17f54f2b5658f45469 (diff) | |
| download | mariadb-git-39f9adfa849a9763dd883fd4661eb9ddfb47d576.tar.gz | |
--{skip-}merge option added which allows the user to disable merge engine and
to avoid the potential security problem.
(see bug #15195: Security Breach with MERGE table)
Diffstat (limited to 'mysql-test/t/warnings-master.opt')
| -rw-r--r-- | mysql-test/t/warnings-master.opt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/warnings-master.opt b/mysql-test/t/warnings-master.opt index 3b8baeddb14..e924a22e2ce 100644 --- a/mysql-test/t/warnings-master.opt +++ b/mysql-test/t/warnings-master.opt @@ -1 +1 @@ ---skip-isam +--skip-isam --skip-merge |