diff options
| author | Bernd Kuhls <bernd.kuhls@t-online.de> | 2017-05-13 19:58:26 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-06-08 23:24:23 +0200 |
| commit | 94bad4fbf5759302a9f8f33267989d543f3a1167 (patch) | |
| tree | 59057c03632c2f38ebf81eb7d89b9405dcb583f6 /package/oracle-mysql | |
| parent | 7d286be4f96cfb731e184c3e8cfea27a031bde3c (diff) | |
| download | buildroot-94bad4fbf5759302a9f8f33267989d543f3a1167.tar.gz buildroot-94bad4fbf5759302a9f8f33267989d543f3a1167.zip | |
package/oracle-mysql: fix build with gcc 7.x
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
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 | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/package/oracle-mysql/0008-gcc7.patch b/package/oracle-mysql/0008-gcc7.patch new file mode 100644 index 0000000000..2cf6d26125 --- /dev/null +++ b/package/oracle-mysql/0008-gcc7.patch @@ -0,0 +1,24 @@ +Fix gcc7 compile + +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> + +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 +@@ -2684,7 +2684,7 @@ + mysql_free_result(fields); + break; + } +- field_names[i][num_fields*2]= '\0'; ++ field_names[i][num_fields*2]= NULL; + j=0; + while ((sql_field=mysql_fetch_field(fields))) + { |
