database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.1 into 10.2

Browse Source 
Temporarily disable a test for
commit 2175bfce3e
because fixing it in 10.2 requires updating libmariadb.
This commit is contained in:
Marko Mäkelä
2019-02-03 17:22:05 +02:00
parent 261ce5286f 955c7b3222
commit a249e57b68
96 changed files with 2571 additions and 7304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mysql-test/t/mysql.test
View File

@ -680,3 +680,26 @@ show create table "a1\""b1";
select * from "a1\""b1";
drop table "a1\""b1";
set sql_mode=default;
#
# mysql --local-infile
#
--let $ldli = load data local infile '$MYSQLTEST_VARDIR/tmp/bug.sql' into table test.t1;
create table t1 (a text);
--exec $MYSQL -e "$ldli"
select count(*) from t1; truncate table t1;
--exec $MYSQL --enable-local-infile -e "$ldli"
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;
drop table t1;