From b3d571c398434c7be3b4a7ebb7a7d731f9ef10ad Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Wed, 6 Feb 2019 12:27:56 +0100
Subject: [PATCH] C/C 3.0.9

---
 libmariadb                |  2 +-
 mysql-test/r/mysql.result | 13 ++++++++++++-
 mysql-test/t/mysql.test   | 17 ++++++++---------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/libmariadb b/libmariadb
index 34f8887af03..1e5e21cae95 160000
--- a/libmariadb
+++ b/libmariadb
@@ -1 +1 @@
-Subproject commit 34f8887af03d022416dd6593de91d0706e57f46b
+Subproject commit 1e5e21cae9506db5ecd9da8f4406b32f01c11abc
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;