diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2018-05-23 18:20:45 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2018-06-11 15:08:58 +0200 |
| commit | 7b2f4b82ea4dd8a63c2806c452b319f26493206c (patch) | |
| tree | 3d808519a57dc266146afb64ec4965e9582e0bdc /client | |
| parent | 95b3813c1ae973c674e256ac59cb4488dd22d0c1 (diff) | |
| download | mariadb-git-7b2f4b82ea4dd8a63c2806c452b319f26493206c.tar.gz | |
Fix build break with modern compilers:
client/mysql.cc: In function void build_completion_hash(bool, bool):
client/mysql.cc:2674:37: error: invalid conversion from char to char* [-fpermissive]
field_names[i][num_fields*2]= '\0';
^~~~
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 715d74f18b2..9c54f564192 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -2671,7 +2671,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))) { |