Merge tag 'mariadb-10.0.20' into 10.1

This commit is contained in:
Sergei Golubchik 2015-06-27 20:35:26 +02:00
commit 658992699b
390 changed files with 7196 additions and 4464 deletions

View file

@ -320,7 +320,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;