diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-11-20 22:41:41 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-11-20 22:41:41 +0100 |
| commit | 317b72f469867bd3e1765418e325515d6065d45f (patch) | |
| tree | aced93fe36617d2a1336f1e0d4b9412ef5613c30 /package/oracle-mysql | |
| parent | 041715cc5337bbd7311da4f5b0fd97da1b902a38 (diff) | |
| download | buildroot-317b72f469867bd3e1765418e325515d6065d45f.tar.gz buildroot-317b72f469867bd3e1765418e325515d6065d45f.zip | |
oracle-mysql: fix build with gcc 7.x
This adjusts an existing patch to also fix gcc 7.x build issues on the
server side of MySQL.
Fixes:
http://autobuild.buildroot.net/results/9e3a0b5b8f2506fb2ce2fcc3d5d3a494a14439cb
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/oracle-mysql')
| -rw-r--r-- | package/oracle-mysql/0008-gcc7.patch | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/package/oracle-mysql/0008-gcc7.patch b/package/oracle-mysql/0008-gcc7.patch index 2cf6d26125..321112d635 100644 --- a/package/oracle-mysql/0008-gcc7.patch +++ b/package/oracle-mysql/0008-gcc7.patch @@ -4,15 +4,17 @@ mysql.cc: In function 'void build_completion_hash(bool, bool)': mysql.cc:2687:37: error: invalid conversion from 'char' to 'char*' [-fpermissive] field_names[i][num_fields*2]= '\0'; ^~~~ - Patch was partly backported from upstream commit: https://github.com/mysql/mysql-server/commit/ae21683d980d5fe9e39bd0193827ea3604256eb9 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> +[Thomas: add more gcc 7.x fixes in instance_map.cc.] +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -diff -uNr mysql-5.1.73.org/client/mysql.cc mysql-5.1.73/client/mysql.cc ---- mysql-5.1.73.org/client/mysql.cc 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/client/mysql.cc 2017-05-13 19:52:10.125101101 +0200 +Index: b/client/mysql.cc +=================================================================== +--- a/client/mysql.cc ++++ b/client/mysql.cc @@ -2684,7 +2684,7 @@ mysql_free_result(fields); break; @@ -22,3 +24,22 @@ diff -uNr mysql-5.1.73.org/client/mysql.cc mysql-5.1.73/client/mysql.cc j=0; while ((sql_field=mysql_fetch_field(fields))) { +Index: b/server-tools/instance-manager/instance_map.cc +=================================================================== +--- a/server-tools/instance-manager/instance_map.cc ++++ b/server-tools/instance-manager/instance_map.cc +@@ -526,12 +526,12 @@ + Options::Main::config_file); + + argv_options[1]= defaults_file_arg; +- argv_options[2]= '\0'; ++ argv_options[2]= NULL; + + argc= 2; + } + else +- argv_options[1]= '\0'; ++ argv_options[1]= NULL; + + /* + If the routine failed, we'll simply fallback to defaults in |
