Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
91213f51 · msvensson@pilot.blaudden · eeaf1fa6 · 4e84ab3f · 91213f51
Commit 91213f51 authored Apr 18, 2007 by msvensson@pilot.blaudden
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

client/mysql_upgrade.c client/mysql_upgrade.c +1 -1

No files found.
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -505,7 +505,7 @@ static int extract_variable_from_show(DYNAMIC_STRING* ds, char* value)
  value_start++;
  /* Don't copy the ending newline */
-  if (value_start && (value_end= strchr(value_start, '\n')) == NULL)
+  if ((value_end= strchr(value_start, '\n')) == NULL)
    return 1; /* Unexpected result */
  strncpy(value, value_start, min(FN_REFLEN, value_end-value_start));