diff options
m--------- | libmariadb | 0 | ||||
-rw-r--r-- | mysql-test/r/mysql.result | 13 | ||||
-rw-r--r-- | mysql-test/t/mysql.test | 17 |
3 files changed, 20 insertions, 10 deletions
diff --git a/libmariadb b/libmariadb -Subproject 34f8887af03d022416dd6593de91d0706e57f46 +Subproject 1e5e21cae9506db5ecd9da8f4406b32f01c11ab diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index 02ca052cfc8..07f49d32b2e 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -613,5 +613,16 @@ select count(*) from t1; count(*) 0 truncate table t1; -### FIXME: update libmariadb +select count(*) from t1; +count(*) +0 +truncate table t1; +select count(*) from t1; +count(*) +41 +truncate table t1; +select count(*) from t1; +count(*) +0 +truncate table t1; drop table t1; diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index a90095d06f5..9178658dfbe 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/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; |