jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 13:16:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/oracle-mysql: fix build with gcc 7.x

Browse Source 
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Bernd Kuhls 2017-05-13 19:58:26 +02:00 committed by Thomas Petazzoni
parent 7d286be4f9
commit 94bad4fbf5
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
package/oracle-mysql/0008-gcc7.patch Normal file
View File

@ -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)))
{