← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/mysqlbinlog.cc

  • Committer: Stewart Smith
  • Date: 2008-07-07 02:19:59 UTC
  • mfrom: (80 drizzle)
  • mto: This revision was merged to the branch mainline in revision 111.
  • Revision ID: stewart@flamingspork.com-20080707021959-1e3eykadgdj0i2v2
merge mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/mysqlbinlog.cc
1673
1673
    {
1674
1674
      if (file->error)
1675
1675
      {
1676
 
        error("Could not read entry at offset %llu: "
 
1676
        error("Could not read entry at offset %lu: "
1677
1677
              "Error in log format or read error.", (ulonglong)tmp_pos);
1678
1678
        return ERROR_STOP;
1679
1679
      }
1727
1727
          /* EOF can't be hit here normally, so it's a real error */
1728
1728
        {
1729
1729
          error("Could not read a Format_description_log_event event at "
1730
 
                "offset %llu; this could be a log format error or read error.",
 
1730
                "offset %lu; this could be a log format error or read error.",
1731
1731
                (ulonglong)tmp_pos);
1732
1732
          return ERROR_STOP;
1733
1733
        }
1759
1759
        if (!(ev= Log_event::read_log_event(file, glob_description_event)))
1760
1760
        {
1761
1761
          /* EOF can't be hit here normally, so it's a real error */
1762
 
          error("Could not read a Rotate_log_event event at offset %llu;"
 
1762
          error("Could not read a Rotate_log_event event at offset %lu;"
1763
1763
                " this could be a log format error or read error.",
1764
1764
                (ulonglong)tmp_pos);
1765
1765
          return ERROR_STOP;
1994
1994
  my_end(my_end_arg | MY_DONT_FREE_DBUG);
1995
1995
 
1996
1996
  exit(retval == ERROR_STOP ? 1 : 0);
1997
 
  /* Keep compilers happy. */
1998
 
  DBUG_RETURN(retval == ERROR_STOP ? 1 : 0);
1999
1997
}
2000
1998
 
2001
1999
/*
2003
2001
  the server
2004
2002
*/
2005
2003
 
2006
 
#include "my_decimal.h"
2007
 
#include "decimal.c"
2008
 
#include "my_decimal.cc"
2009
2004
#include "log_event.cc"
2010
2005