diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-12 12:04:10 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-12 12:04:10 +0100 |
| commit | b953d70d15d3a723e33aaa268a321b51d2b028ca (patch) | |
| tree | 825a6b6aa33696ecf77aa89df7384c9cddfb6455 /mysql-test/main/mysql.test | |
| parent | 31d6e9c3c83c5248789df14f13e6f14599170f9c (diff) | |
| parent | 8a9cdc5f44b14466e79630778c5e76d941d28435 (diff) | |
| download | mariadb-git-b953d70d15d3a723e33aaa268a321b51d2b028ca.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 | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/mysql-test/main/mysql.test b/mysql-test/main/mysql.test index 66ccef18327..cd335973288 100644 --- a/mysql-test/main/mysql.test +++ b/mysql-test/main/mysql.test @@ -693,13 +693,12 @@ select count(*) from t1; truncate table t1; --error 1 --exec $MYSQL --disable-local-infile -e "$ldli" select count(*) from t1; truncate table t1; ---echo ### FIXME: update libmariadb -#--error 1 -#--exec $MYSQL -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; -# --error 1 -# --exec $MYSQL --disable-local-infile -e "/*q*/$ldli" -#select count(*) from t1; truncate table t1; +--error 1 +--exec $MYSQL -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; + --error 1 + --exec $MYSQL --disable-local-infile -e "/*q*/$ldli" +select count(*) from t1; truncate table t1; drop table t1; |