database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-20 10:24:14 +03:00
Code Activity

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Oleksandr Byelkin
2019-02-12 12:04:10 +01:00
parent 31d6e9c3c8 8a9cdc5f44
commit b953d70d15
16 changed files with 129 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mysql-test/main/mysql.test
View File

@ -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;