From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Tue, 14 Jul 2020 16:31:51 +0000 (+0200)
Subject: package/oracle-mysql: renumber patch
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1e23e2ab45872c111dbd069e71f7721af6043a10;p=buildroot.git

package/oracle-mysql: renumber patch

Renumber patch added by commit 94bad4fbf5759302a9f8f33267989d543f3a1167

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---

diff --git a/package/oracle-mysql/0008-gcc7.patch b/package/oracle-mysql/0008-gcc7.patch
deleted file mode 100644
index 321112d635..0000000000
--- a/package/oracle-mysql/0008-gcc7.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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>
-[Thomas: add more gcc 7.x fixes in instance_map.cc.]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/client/mysql.cc
-===================================================================
---- a/client/mysql.cc
-+++ b/client/mysql.cc
-@@ -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)))
-       {
-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
diff --git a/package/oracle-mysql/0009-gcc7.patch b/package/oracle-mysql/0009-gcc7.patch
new file mode 100644
index 0000000000..321112d635
--- /dev/null
+++ b/package/oracle-mysql/0009-gcc7.patch
@@ -0,0 +1,45 @@
+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>
+[Thomas: add more gcc 7.x fixes in instance_map.cc.]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/client/mysql.cc
+===================================================================
+--- a/client/mysql.cc
++++ b/client/mysql.cc
+@@ -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)))
+       {
+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