Commit 3471a8b6 authored by unknown's avatar unknown
Browse files

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


extra/comp_err.c:
  Auto merged
parents ef56d39b 0a5780bc

extra/comp_err.c

+2 −2
Original line number Diff line number Diff line
@@ -637,9 +637,9 @@ static struct message *find_message(struct errors *err, const char *lang, 
      either.

*/



static char checksum_format_specifier(const char* msg)

static ha_checksum checksum_format_specifier(const char* msg)

{

  char chksum= 0;

  ha_checksum chksum= 0;

  const char* p= msg;

  const char* start= 0;

  int num_format_specifiers= 0;