merge mit gfaserver

Make-bb-kernel_Qt5.7.sh

@@ -25,9 +25,10 @@ git clone git://git.buildroot.net/buildroot ./buildroot57
 cd buildroot57
 git checkout 63a20d5dfebe83e2b2bd683dc78ebdf787dff100 -b gfawrk
 patch -p1 < ../GfA/patches/0001-GfA-wrk-changes-and-setup.patch
+patch -p1 < ../GfA/patches/0002-mysql-add-innodb-engine-to-package.patch
 patch -p1 < ../GfA/patches/0003-add-SW_IO1-to-SW_IO4-to-headers-and-evtest.patch
 patch -p1 < ../GfA/patches/0004-libmodbus-GfA-fflush-for-debug.patch
-patch -p2 < ../GfA/patches/0005-GfA-empty-input-queue-on-CRC-error.patch
+patch -p1 < ../GfA/patches/0005-GfA-empty-input-queue-on-CRC-error.patch
 #
 chmod a+x *.sh
 cp ../GfA/configs/* ./configs

patches/0002-mysql-add-innodb-engine-to-package.patch

@@ -0,0 +1,15 @@
+diff --git a/package/mysql/mysql.mk b/package/mysql/mysql.mk
+index ea330f2515..826612b655 100644
+--- a/package/mysql/mysql.mk
++++ b/package/mysql/mysql.mk
+@@ -84,8 +84,8 @@ MYSQL_CONF_OPTS += \
+ 	--without-plugin-example \
+ 	--without-plugin-federated \
+ 	--without-plugin-ibmdb2i \
+-	--without-plugin-innobase \
+-	--without-plugin-innodb_plugin \
++	--with-plugin-innobase \
++	--with-plugin-innodb_plugin \
+ 	--without-plugin-ndbcluster
+ 
+ # Debugging is only available for the server, so no need for