diff options
| author | Ignacio Galarza <iggy@mysql.com> | 2009-02-13 11:41:47 -0500 |
|---|---|---|
| committer | Ignacio Galarza <iggy@mysql.com> | 2009-02-13 11:41:47 -0500 |
| commit | 5b7347bda31b9d66cd78937e5dc339f553b9a736 (patch) | |
| tree | 85b39362efeae16536a90f3a3624acd6916d4305 /sql/sql_servers.cc | |
| parent | 50b19265ffcf4e4708c86345a5c166c58dbdb523 (diff) | |
| parent | 54fbbf9591e21cda9f7b26c2d795d88f51827f07 (diff) | |
| download | mariadb-git-5b7347bda31b9d66cd78937e5dc339f553b9a736.tar.gz | |
Bug#29125 Windows Server X64: so many compiler warnings
- Remove bothersome warning messages. This change focuses on the warnings
that are covered by the ignore file: support-files/compiler_warnings.supp.
- Strings are guaranteed to be max uint in length
Diffstat (limited to 'sql/sql_servers.cc')
| -rw-r--r-- | sql/sql_servers.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_servers.cc b/sql/sql_servers.cc index 13bed8001a3..b1c856c87aa 100644 --- a/sql/sql_servers.cc +++ b/sql/sql_servers.cc @@ -60,7 +60,7 @@ prepare_server_struct_for_insert(LEX_SERVER_OPTIONS *server_options); /* drop functions */ static int delete_server_record(TABLE *table, char *server_name, - int server_name_length); + size_t server_name_length); static int delete_server_record_in_cache(LEX_SERVER_OPTIONS *server_options); /* update functions */ @@ -301,7 +301,7 @@ get_server_from_table_to_cache(TABLE *table) /* get each field into the server struct ptr */ server->server_name= get_field(&mem, table->field[0]); - server->server_name_length= strlen(server->server_name); + server->server_name_length= (uint) strlen(server->server_name); ptr= get_field(&mem, table->field[1]); server->host= ptr ? ptr : blank; ptr= get_field(&mem, table->field[2]); @@ -911,7 +911,7 @@ end: static int delete_server_record(TABLE *table, - char *server_name, int server_name_length) + char *server_name, size_t server_name_length) { int error; DBUG_ENTER("delete_server_record"); @@ -1271,7 +1271,7 @@ static FOREIGN_SERVER *clone_server(MEM_ROOT *mem, const FOREIGN_SERVER *server, FOREIGN_SERVER *get_server_by_name(MEM_ROOT *mem, const char *server_name, FOREIGN_SERVER *buff) { - uint server_name_length; + size_t server_name_length; FOREIGN_SERVER *server; DBUG_ENTER("get_server_by_name"); DBUG_PRINT("info", ("server_name %s", server_name)); |