diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2018-02-14 01:05:17 +0100 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2018-02-14 01:24:32 +0100 |
| commit | bb6f2115f03bcc765a2b1958016cbc1c6c9918c9 (patch) | |
| tree | ee7ab78945da753fd214eb7b14b57c6625ac93bd | |
| parent | Add patch to enable NUMA in MariaDB 10.1 (diff) | |
| download | mysql-extras-bb6f2115f03bcc765a2b1958016cbc1c6c9918c9.tar.gz mysql-extras-bb6f2115f03bcc765a2b1958016cbc1c6c9918c9.tar.bz2 mysql-extras-bb6f2115f03bcc765a2b1958016cbc1c6c9918c9.zip | |
Add patch to fix invalid type in MySQL 5.5
Bug: https://bugs.gentoo.org/645894
| -rw-r--r-- | 00000_index.txt | 6 | ||||
| -rw-r--r-- | 20030_all_mysql-5.5-fix-client-mysql-type.patch | 29 |
2 files changed, 35 insertions, 0 deletions
diff --git a/00000_index.txt b/00000_index.txt index 19fb8a1..b5d3ee4 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -926,3 +926,9 @@ @pn mysql @pn mariadb @@ Fix tests for Perl 5.26+ compatibility + +@patch 20030_all_mysql-5.5-fix-client-mysql-type.patch +@ver 5.05.58.00 to 5.05.99.99 +@pn mysql +@@ Fix type in mysql client +@@ Bug 645894 diff --git a/20030_all_mysql-5.5-fix-client-mysql-type.patch b/20030_all_mysql-5.5-fix-client-mysql-type.patch new file mode 100644 index 0000000..b62e192 --- /dev/null +++ b/20030_all_mysql-5.5-fix-client-mysql-type.patch @@ -0,0 +1,29 @@ +From https://github.com/MariaDB/server/commit/7338d3f221e33042dfcf5c1a245317aa7cb015a7 +From: Daniel Black <daniel.black@au.ibm.com> +Date: Fri, 14 Jul 2017 13:37:37 +1000 +Subject: [PATCH] client: mysql - fix type + +field_names[x][y] is a pointer + +client/mysql.cc: In function 'void build_completion_hash(bool, bool)': +client/mysql.cc:2855:37: error: invalid conversion from 'char' to 'char*' [-fpermissive] + field_names[i][num_fields*2]= '\0'; + +Bug: https://bugs.gentoo.org/645894 +--- + client/mysql.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/client/mysql.cc b/client/mysql.cc +index a965ced89c65..ca586a5590fb 100644 +--- a/client/mysql.cc ++++ b/client/mysql.cc +@@ -2852,7 +2852,7 @@ You can turn off this feature to get a quicker startup with -A\n\n"); + 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))) + { |