diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-03 17:22:05 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-03 17:22:05 +0200 |
| commit | a249e57b684a23dce4cbb870ca3eb30c77cb9fd6 (patch) | |
| tree | 9c50673311474f7efa0d5d110461ad324c7a62e6 /mysql-test/t/mysql.test | |
| parent | 261ce5286f266f1a5fab5e8adc2c08adef658d13 (diff) | |
| parent | 955c7b32226c816b24a2ed1750e12bc0256565ad (diff) | |
| download | mariadb-git-a249e57b684a23dce4cbb870ca3eb30c77cb9fd6.tar.gz | |
Merge 10.1 into 10.2
Temporarily disable a test for
commit 2175bfce3e9da8332f10ab0e0286dc93915533a2
because fixing it in 10.2 requires updating libmariadb.
Diffstat (limited to 'mysql-test/t/mysql.test')
| -rw-r--r-- | mysql-test/t/mysql.test | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index e3219c21517..a90095d06f5 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -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; |