Commit 42339e0f authored by Mats Kindahl's avatar Mats Kindahl
Browse files

Merging 5.1 into 5.1-rpl-merge

parents 4c30c091 2b5e539c

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -389,6 +389,9 @@ client/readline.cpp 
client/rpl_constants.h

client/rpl_record_old.cc

client/rpl_record_old.h

client/rpl_tblmap.h

client/rpl_tblmap.cc

client/rpl_utility.h

client/select_test

client/sql_string.cpp

client/ssl_test

client/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ DEFS = -DUNDEF_THREADS_HACK \ 
			-DDATADIR="\"$(localstatedir)\""



sql_src=log_event.h mysql_priv.h rpl_constants.h \

	rpl_utility.h rpl_tblmap.h rpl_tblmap.cc \

	log_event.cc my_decimal.h my_decimal.cc \

	log_event_old.h log_event_old.cc \

	rpl_record_old.h rpl_record_old.cc

client/mysqlbinlog.cc

+15 −1
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ static void warning(const char *format, ...) ATTRIBUTE_FORMAT(printf, 1, 2); 


static bool one_database=0, to_last_remote_log= 0, disable_log_bin= 0;

static bool opt_hexdump= 0;

const char *base64_output_mode_names[]= {"NEVER", "AUTO", "ALWAYS", NullS};

const char *base64_output_mode_names[]=

{"NEVER", "AUTO", "ALWAYS", "UNSPEC", "DECODE-ROWS", NullS};

TYPELIB base64_output_mode_typelib=

  { array_elements(base64_output_mode_names) - 1, "",

    base64_output_mode_names, NULL };
@@ -83,6 +84,8 @@ static const char* user = 0; 
static char* pass = 0;

static char *charset= 0;



static uint verbose= 0;



static ulonglong start_position, stop_position;

#define start_position_mot ((my_off_t)start_position)

#define stop_position_mot  ((my_off_t)stop_position)
@@ -1063,6 +1066,9 @@ that may lead to an endless loop.", 
  {"user", 'u', "Connect to the remote server as username.",

   (uchar**) &user, (uchar**) &user, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0,

   0, 0},

  {"verbose", 'v', "Reconstruct SQL statements out of row events. "

                   "-v -v adds comments on column data types",

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

  {"version", 'V', "Print version and exit.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0,

   0, 0, 0, 0, 0},

  {"open_files_limit", OPT_OPEN_FILES_LIMIT,
@@ -1258,6 +1264,12 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
        (find_type_or_exit(argument, &base64_output_mode_typelib, opt->name)-1);

    }

    break;

  case 'v':

    if (argument == disabled_my_option)

      verbose= 0;

    else

      verbose++;

    break;

  case 'V':

    print_version();

    exit(0);
@@ -1344,6 +1356,8 @@ static Exit_status dump_log_entries(const char* logname) 
  fprintf(result_file, "DELIMITER /*!*/;\n");

  strmov(print_event_info.delimiter, "/*!*/;");

  

  print_event_info.verbose= short_form ? 0 : verbose;



  rc= (remote_opt ? dump_remote_log_entries(&print_event_info, logname) :

       dump_local_log_entries(&print_event_info, logname));

include/my_sys.h

+1 −0
Original line number Diff line number Diff line
@@ -577,6 +577,7 @@ extern int my_close(File Filedes,myf MyFlags); 
extern File my_dup(File file, myf MyFlags);

extern int my_mkdir(const char *dir, int Flags, myf MyFlags);

extern int my_readlink(char *to, const char *filename, myf MyFlags);

extern int my_is_symlink(const char *filename);

extern int my_realpath(char *to, const char *filename, myf MyFlags);

extern File my_create_with_symlink(const char *linkname, const char *filename,

				   int createflags, int access_flags,

include/myisam.h

+4 −0
Original line number Diff line number Diff line
@@ -256,6 +256,10 @@ extern my_bool myisam_flush,myisam_delay_key_write,myisam_single_user; 
extern my_off_t myisam_max_temp_length;

extern ulong myisam_bulk_insert_tree_size, myisam_data_pointer_size;



/* usually used to check if a symlink points into the mysql data home */

/* which is normally forbidden                                        */

extern int (*myisam_test_invalid_symlink)(const char *filename);



	/* Prototypes for myisam-functions */



extern int mi_close(struct st_myisam_info *file);