diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-06-11 20:20:35 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-11 20:20:35 +0200 |
| commit | 810cf362eae28d4a096e0acea7efa67dd32aa05b (patch) | |
| tree | 4f7b2f858e8a57022e790bcac6d88b5e3451ee0f /sql/sql_servers.cc | |
| parent | a99efc00a68fe2406343e63b67fc4ea58bed345a (diff) | |
| parent | d199a0ffb0aac86881ea2db7dd78bc07b438dc67 (diff) | |
| download | mariadb-git-810cf362eae28d4a096e0acea7efa67dd32aa05b.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_servers.cc')
| -rw-r--r-- | sql/sql_servers.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_servers.cc b/sql/sql_servers.cc index 2b0576ffba9..8d5bb2b596d 100644 --- a/sql/sql_servers.cc +++ b/sql/sql_servers.cc @@ -326,7 +326,8 @@ get_server_from_table_to_cache(TABLE *table) table->use_all_columns(); /* get each field into the server struct ptr */ - server->server_name= get_field(&mem, table->field[0]); + ptr= get_field(&mem, table->field[0]); + server->server_name= ptr ? ptr : blank; server->server_name_length= (uint) strlen(server->server_name); ptr= get_field(&mem, table->field[1]); server->host= ptr ? ptr : blank; |