Commit e549194f authored by unknown's avatar unknown
Browse files

Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/home/hartmut/projects/mysql/dev/5.1


client/mysqlbinlog.cc:
  Auto merged
parents ac36a084 d1685606

client/client_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -52,5 +52,5 @@ enum options_client 
  OPT_TRIGGERS,

  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,

  OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_CREATE_SLAP_SCHEMA,

  OPT_MYSQL_REPLACE_INTO

  OPT_MYSQL_REPLACE_INTO, OPT_SERVER_ID

};

client/mysqlbinlog.cc

+8 −0
Original line number Diff line number Diff line
@@ -516,6 +516,9 @@ int process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev, 
      start_datetime= 0;

      offset= 0; // print everything and protect against cycling rec_count

    }

    if (server_id && (server_id != ev->server_id)) {

      DBUG_RETURN(0);

    }

    if (((my_time_t)(ev->when) >= stop_datetime)

        || (pos >= stop_position_mot))

    {
@@ -742,6 +745,11 @@ static struct my_option my_long_options[] = 
   (gptr*) &stop_position, (gptr*) &stop_position, 0, GET_ULL,

   REQUIRED_ARG, (ulonglong)(~(my_off_t)0), BIN_LOG_HEADER_SIZE,

   (ulonglong)(~(my_off_t)0), 0, 0, 0},

  {"server-id", OPT_SERVER_ID,

   "Only extract binlog entries created by a certain server id "

   "passed on the command line.",

   (gptr*) &server_id, (gptr*) &server_id, 0, GET_ULONG,

   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"to-last-log", 't', "Requires -R. Will not stop at the end of the \

requested binlog but rather continue printing until the end of the last \

binlog of the MySQL server. If you send the output to the same MySQL server, \

extra/Makefile.am

+3 −0
Original line number Diff line number Diff line
@@ -44,5 +44,8 @@ bin_PROGRAMS = replace comp_err perror resolveip my_print_defaults \ 
			resolve_stack_dump mysql_waitpid innochecksum

noinst_PROGRAMS =	charset2html



perror.o: perror.c 

	$(COMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<



# Don't update the files from bitkeeper

%::SCCS/s.%

extra/perror.c

+4 −4
Original line number Diff line number Diff line
@@ -23,14 +23,14 @@ 
#include <m_string.h>

#include <errno.h>

#include <my_getopt.h>

#ifdef HAVE_NDBCLUSTER_DB

#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE

#include "../storage/ndb/src/ndbapi/ndberror.c"

#include "../storage/ndb/src/kernel/error/ndbd_exit_codes.c"

#endif



static my_bool verbose, print_all_codes;



#ifdef HAVE_NDBCLUSTER_DB

#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE

static my_bool ndb_code;

static char ndb_string[1024];

#endif
@@ -41,7 +41,7 @@ static struct my_option my_long_options[] = 
   NO_ARG, 0, 0, 0, 0, 0, 0},

  {"info", 'I', "Synonym for --help.",  0, 0, 0, GET_NO_ARG,

   NO_ARG, 0, 0, 0, 0, 0, 0},

#ifdef HAVE_NDBCLUSTER_DB

#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE

  {"ndb", 257, "Ndbcluster storage engine specific error codes.",  (gptr*) &ndb_code,

   (gptr*) &ndb_code, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

#endif
@@ -233,7 +233,7 @@ int main(int argc,char *argv[]) 


      found=0;

      code=atoi(*argv);

#ifdef HAVE_NDBCLUSTER_DB

#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE

      if (ndb_code)

      {

	if ((ndb_error_string(code, ndb_string, sizeof(ndb_string)) < 0) &&