[oe-commits] [meta-openembedded] 22/55: mariadb: Upgrade to 5.5.55
git at git.openembedded.org
git at git.openembedded.org
Wed Apr 26 07:30:57 UTC 2017
This is an automated email from the git hooks/post-receive script.
martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.
commit 2d585df99cbf07bd2d9127913fbf5967347434de
Author: Khem Raj <raj.khem at gmail.com>
AuthorDate: Sun Apr 23 22:20:55 2017 -0700
mariadb: Upgrade to 5.5.55
Fix build with gcc7
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
.../{mariadb-native_5.5.52.bb => mariadb-native_5.5.55.bb} | 0
meta-oe/recipes-support/mysql/mariadb.inc | 5 +++--
meta-oe/recipes-support/mysql/mariadb/gcc7.patch | 13 +++++++++++++
.../mysql/{mariadb_5.5.52.bb => mariadb_5.5.55.bb} | 0
4 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.5.52.bb b/meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb
similarity index 100%
rename from meta-oe/recipes-support/mysql/mariadb-native_5.5.52.bb
rename to meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb
diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc
index 4019072..fd9dcbd 100644
--- a/meta-oe/recipes-support/mysql/mariadb.inc
+++ b/meta-oe/recipes-support/mysql/mariadb.inc
@@ -17,9 +17,10 @@ SRC_URI = "http://downloads.mariadb.com/MariaDB/mariadb-${PV}/source/mariadb-${P
file://fix-a-building-failure.patch \
file://change-cc-to-cc-version.patch \
file://0001-disable-ucontext-on-musl.patch \
+ file://gcc7.patch \
"
-SRC_URI[md5sum] = "fca86f1eaed2163b4bdce4f98f472324"
-SRC_URI[sha256sum] = "e142f9459507b97c5848042863b313ce70750118446bb4e35e5c07fe66007293"
+SRC_URI[md5sum] = "54a0bbbc9b67308e7c076622d02f0fcd"
+SRC_URI[sha256sum] = "cb94e315d0fc90c62db5a6c7829c9966f674285d99b3ba3ffa575fb4a26edc86"
S = "${WORKDIR}/mariadb-${PV}"
diff --git a/meta-oe/recipes-support/mysql/mariadb/gcc7.patch b/meta-oe/recipes-support/mysql/mariadb/gcc7.patch
new file mode 100644
index 0000000..3e75b26
--- /dev/null
+++ b/meta-oe/recipes-support/mysql/mariadb/gcc7.patch
@@ -0,0 +1,13 @@
+Index: mariadb-5.5.55/client/mysql.cc
+===================================================================
+--- mariadb-5.5.55.orig/client/mysql.cc
++++ mariadb-5.5.55/client/mysql.cc
+@@ -2850,7 +2850,7 @@ You can turn off this feature to get a q
+ mysql_free_result(fields);
+ break;
+ }
+- field_names[i][num_fields*2]= '\0';
++ field_names[i][num_fields*2][0]= '\0';
+ j=0;
+ while ((sql_field=mysql_fetch_field(fields)))
+ {
diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.52.bb b/meta-oe/recipes-support/mysql/mariadb_5.5.55.bb
similarity index 100%
rename from meta-oe/recipes-support/mysql/mariadb_5.5.52.bb
rename to meta-oe/recipes-support/mysql/mariadb_5.5.55.bb
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list