1*4882a593SmuzhiyunFix gcc7 compile 2*4882a593Smuzhiyun 3*4882a593Smuzhiyunmysql.cc: In function 'void build_completion_hash(bool, bool)': 4*4882a593Smuzhiyunmysql.cc:2687:37: error: invalid conversion from 'char' to 'char*' [-fpermissive] 5*4882a593Smuzhiyun field_names[i][num_fields*2]= '\0'; 6*4882a593Smuzhiyun ^~~~ 7*4882a593SmuzhiyunPatch was partly backported from upstream commit: 8*4882a593Smuzhiyunhttps://github.com/mysql/mysql-server/commit/ae21683d980d5fe9e39bd0193827ea3604256eb9 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunSigned-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> 11*4882a593Smuzhiyun[Thomas: add more gcc 7.x fixes in instance_map.cc.] 12*4882a593SmuzhiyunSigned-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunIndex: b/client/mysql.cc 15*4882a593Smuzhiyun=================================================================== 16*4882a593Smuzhiyun--- a/client/mysql.cc 17*4882a593Smuzhiyun+++ b/client/mysql.cc 18*4882a593Smuzhiyun@@ -2684,7 +2684,7 @@ 19*4882a593Smuzhiyun mysql_free_result(fields); 20*4882a593Smuzhiyun break; 21*4882a593Smuzhiyun } 22*4882a593Smuzhiyun- field_names[i][num_fields*2]= '\0'; 23*4882a593Smuzhiyun+ field_names[i][num_fields*2]= NULL; 24*4882a593Smuzhiyun j=0; 25*4882a593Smuzhiyun while ((sql_field=mysql_fetch_field(fields))) 26*4882a593Smuzhiyun { 27*4882a593SmuzhiyunIndex: b/server-tools/instance-manager/instance_map.cc 28*4882a593Smuzhiyun=================================================================== 29*4882a593Smuzhiyun--- a/server-tools/instance-manager/instance_map.cc 30*4882a593Smuzhiyun+++ b/server-tools/instance-manager/instance_map.cc 31*4882a593Smuzhiyun@@ -526,12 +526,12 @@ 32*4882a593Smuzhiyun Options::Main::config_file); 33*4882a593Smuzhiyun 34*4882a593Smuzhiyun argv_options[1]= defaults_file_arg; 35*4882a593Smuzhiyun- argv_options[2]= '\0'; 36*4882a593Smuzhiyun+ argv_options[2]= NULL; 37*4882a593Smuzhiyun 38*4882a593Smuzhiyun argc= 2; 39*4882a593Smuzhiyun } 40*4882a593Smuzhiyun else 41*4882a593Smuzhiyun- argv_options[1]= '\0'; 42*4882a593Smuzhiyun+ argv_options[1]= NULL; 43*4882a593Smuzhiyun 44*4882a593Smuzhiyun /* 45*4882a593Smuzhiyun If the routine failed, we'll simply fallback to defaults in 46