C/C 3.0.9

b3d571c3 · Sergei Golubchik · a4c687c4 · 1e5e21ca · b3d571c3 · b3d571c3
Commit b3d571c3 authored Feb 06, 2019 by Sergei Golubchik
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 11 deletions

libmariadb libmariadb +1 -1

mysql-test/r/mysql.result mysql-test/r/mysql.result +12 -1

mysql-test/t/mysql.test mysql-test/t/mysql.test +8 -9

No files found.
--- a/libmariadb @ 1e5e21ca
+++ b/libmariadb @ 1e5e21ca
-Subproject commit 34f8887af03d022416dd6593de91d0706e57f46b
+Subproject commit 1e5e21cae9506db5ecd9da8f4406b32f01c11abc
--- 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;
--- 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;