← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mariadb-5.5/utopic-security

« back to all changes in this revision

Viewing changes to sql/sql_servers.cc

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen
  • Date: 2015-06-13 21:09:48 UTC
  • mto: This revision was merged to the branch mainline in revision 15.
  • Revision ID: package-import@ubuntu.com-20150613210948-0un6au1f6ujj37lv
Tags: upstream-5.5.44
Import upstream version 5.5.44

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_servers.cc
326
326
  table->use_all_columns();
327
327
 
328
328
  /* get each field into the server struct ptr */
329
 
  server->server_name= get_field(&mem, table->field[0]);
 
329
  ptr= get_field(&mem, table->field[0]);
 
330
  server->server_name= ptr ? ptr : blank;
330
331
  server->server_name_length= (uint) strlen(server->server_name);
331
332
  ptr= get_field(&mem, table->field[1]);
332
333
  server->host= ptr ? ptr : blank;