diff options
author | Monty <monty@mariadb.org> | 2019-09-02 14:06:56 +0300 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2019-09-03 13:17:32 +0300 |
commit | a071e0e029cd7c155cff1054d9f7f8a6aa898620 (patch) | |
tree | b592c10cb8ca3036688ea19039208eadd485fe7c /mysql-test/main/mysql.test | |
parent | b0ff5a6a7393c057cd201aff63279e45d3e0cc49 (diff) | |
parent | 9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (diff) | |
download | mariadb-git-a071e0e029cd7c155cff1054d9f7f8a6aa898620.tar.gz |
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/mysql.test')
-rw-r--r-- | mysql-test/main/mysql.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/mysql.test b/mysql-test/main/mysql.test index fbc5bd20842..1cb4977a32d 100644 --- a/mysql-test/main/mysql.test +++ b/mysql-test/main/mysql.test @@ -694,7 +694,7 @@ select count(*) from t1; truncate table t1; --exec $MYSQL --disable-local-infile -e "$ldli" select count(*) from t1; truncate table t1; --error 1 ---exec $MYSQL -e "/*q*/$ldli" +--exec $MYSQL --local-infile=0 -e "/*q*/$ldli" select count(*) from t1; truncate table t1; --exec $MYSQL --enable-local-infile -e "/*q*/$ldli" select count(*) from t1; truncate table t1; |