diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-02-06 12:27:56 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-02-06 22:03:02 +0100 |
| commit | b3d571c398434c7be3b4a7ebb7a7d731f9ef10ad (patch) | |
| tree | 4e43d36df72bcc25f4b44114f1f0649f7fbeb6ba /mysql-test | |
| parent | a4c687c4944723a5dc531e6cff1aa3e6d60df821 (diff) | |
| download | mariadb-git-b3d571c398434c7be3b4a7ebb7a7d731f9ef10ad.tar.gz | |
C/C 3.0.9
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/mysql.result | 13 | ||||
| -rw-r--r-- | mysql-test/t/mysql.test | 17 |
2 files changed, 20 insertions, 10 deletions
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; |