Commit 08da99aa authored by unknown's avatar unknown
Browse files

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

into  linux.site:/home/reggie/work/mysql-5.1-rbr_cleanups


sql/handler.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_class.cc:
  accepted Mat's changes to the template defs
parents 9570a118 63a33172

client/mysqlbinlog.cc

+25 −27
Original line number Diff line number Diff line
@@ -663,7 +663,8 @@ Begin_load_query event for file_id: %u\n", exlq->file_id); 


static struct my_option my_long_options[] =

{



  {"help", '?', "Display this help and exit.",

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

#ifdef __NETWARE__

  {"autoclose", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -683,13 +684,13 @@ static struct my_option my_long_options[] = 
  {"character-sets-dir", OPT_CHARSETS_DIR,

   "Directory where character sets are.", (gptr*) &charsets_dir,

   (gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"database", 'd', "List entries for just this database (local log only).",

   (gptr*) &database, (gptr*) &database, 0, GET_STR_ALLOC, REQUIRED_ARG,

   0, 0, 0, 0, 0, 0},

#ifndef DBUG_OFF

  {"debug", '#', "Output debug log.", (gptr*) &default_dbug_option,

   (gptr*) &default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"database", 'd', "List entries for just this database (local log only).",

   (gptr*) &database, (gptr*) &database, 0, GET_STR_ALLOC, REQUIRED_ARG,

   0, 0, 0, 0, 0, 0},

  {"disable-log-bin", 'D', "Disable binary log. This is useful, if you "

    "enabled --to-last-log and are sending the output to the same MySQL server. "

    "This way you could avoid an endless loop. You would also like to use it "
@@ -700,13 +701,14 @@ static struct my_option my_long_options[] = 
  {"force-read", 'f', "Force reading unknown binlog events.",

   (gptr*) &force_opt, (gptr*) &force_opt, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,

   0, 0},

  {"help", '?', "Display this help and exit.",

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

  {"hexdump", 'H', "Augment output with hexadecimal and ASCII event dump.",

   (gptr*) &opt_hexdump, (gptr*) &opt_hexdump, 0, GET_BOOL, NO_ARG,

   0, 0, 0, 0, 0, 0},

  {"host", 'h', "Get the binlog from server.", (gptr*) &host, (gptr*) &host,

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

  {"local-load", 'l', "Prepare local temporary files for LOAD DATA INFILE in the specified directory.",

   (gptr*) &dirname_for_local_load, (gptr*) &dirname_for_local_load, 0,

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

  {"offset", 'o', "Skip the first N entries.", (gptr*) &offset, (gptr*) &offset,

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

  {"password", 'p', "Password to connect to remote server.",
@@ -722,15 +724,15 @@ static struct my_option my_long_options[] = 
  {"protocol", OPT_MYSQL_PROTOCOL,

   "The protocol of connection (tcp,socket,pipe,memory).",

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

  {"result-file", 'r', "Direct output to a given file.", 0, 0, 0, GET_STR,

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

  {"read-from-remote-server", 'R', "Read binary logs from a MySQL server",

   (gptr*) &remote_opt, (gptr*) &remote_opt, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,

   0, 0},

  {"open_files_limit", OPT_OPEN_FILES_LIMIT,

   "Used to reserve file descriptors for usage by this program",

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

   REQUIRED_ARG, MY_NFILE, 8, OS_FILE_LIMIT, 0, 1, 0},

  {"result-file", 'r', "Direct output to a given file.", 0, 0, 0, GET_STR,

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

  {"server-id", OPT_SERVER_ID,

   "Extract only binlog entries created by the server having the given id.",

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

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

  {"short-form", 's', "Just show the queries, no extra info.",

   (gptr*) &short_form, (gptr*) &short_form, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,

   0, 0},
@@ -745,6 +747,13 @@ static struct my_option my_long_options[] = 
   "(you should probably use quotes for your shell to set it properly).",

   (gptr*) &start_datetime_str, (gptr*) &start_datetime_str,

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

  {"start-position", OPT_START_POSITION,

   "Start reading the binlog at position N. Applies to the first binlog "

   "passed on the command line.",

   (gptr*) &start_position, (gptr*) &start_position, 0, GET_ULL,

   REQUIRED_ARG, BIN_LOG_HEADER_SIZE, BIN_LOG_HEADER_SIZE,

   /* COM_BINLOG_DUMP accepts only 4 bytes for the position */

   (ulonglong)(~(uint32)0), 0, 0, 0},

  {"stop-datetime", OPT_STOP_DATETIME,

   "Stop reading the binlog at first event having a datetime equal or "

   "posterior to the argument; the argument must be a date and time "
@@ -753,24 +762,12 @@ static struct my_option my_long_options[] = 
   "(you should probably use quotes for your shell to set it properly).",

   (gptr*) &stop_datetime_str, (gptr*) &stop_datetime_str,

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

  {"start-position", OPT_START_POSITION,

   "Start reading the binlog at position N. Applies to the first binlog "

   "passed on the command line.",

   (gptr*) &start_position, (gptr*) &start_position, 0, GET_ULL,

   REQUIRED_ARG, BIN_LOG_HEADER_SIZE, BIN_LOG_HEADER_SIZE,

   /* COM_BINLOG_DUMP accepts only 4 bytes for the position */

   (ulonglong)(~(uint32)0), 0, 0, 0},

  {"stop-position", OPT_STOP_POSITION,

   "Stop reading the binlog at position N. Applies to the last binlog "

   "passed on the command line.",

   (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, \
@@ -780,11 +777,12 @@ that may lead to an endless loop.", 
  {"user", 'u', "Connect to the remote server as username.",

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

   0, 0},

  {"local-load", 'l', "Prepare local temporary files for LOAD DATA INFILE in the specified directory.",

   (gptr*) &dirname_for_local_load, (gptr*) &dirname_for_local_load, 0,

   GET_STR_ALLOC, REQUIRED_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,

   "Used to reserve file descriptors for usage by this program",

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

   REQUIRED_ARG, MY_NFILE, 8, OS_FILE_LIMIT, 0, 1, 0},

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

};

config/ac-macros/yassl.m4

+3 −1
Original line number Diff line number Diff line
@@ -30,7 +30,9 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ 
        ;;

    esac

    AC_SUBST([yassl_taocrypt_extra_cxxflags])



    # Link extra/yassl/include/openssl subdir to include/

    yassl_h_ln_cmd="\$(LN) -s \$(top_srcdir)/extra/yassl/include/openssl openssl"

    AC_SUBST(yassl_h_ln_cmd)

  else

    yassl_dir=""

    AC_MSG_RESULT(no)

configure.in

+1 −7
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.1.5-alpha)

AM_INIT_AUTOMAKE(mysql, 5.1.6-alpha)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -15,12 +15,6 @@ DOT_FRM_VERSION=6 
# See the libtool docs for information on how to do shared lib versions.

SHARED_LIB_VERSION=15:0:0



# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=19

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

# Remember that regexps needs to quote [ and ] since this is run through m4

MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"`

include/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ noinst_HEADERS = config-win.h config-os2.h config-netware.h \ 
			my_vle.h



# mysql_version.h are generated

CLEANFILES =            mysql_version.h my_config.h readline

CLEANFILES =            mysql_version.h my_config.h readline openssl



# Some include files that may be moved and patched by configure

DISTCLEANFILES =	sched.h $(CLEANFILES)
@@ -42,6 +42,7 @@ DISTCLEANFILES = sched.h $(CLEANFILES) 
link_sources:

	-$(RM) -fr readline

	@readline_h_ln_cmd@

	@yassl_h_ln_cmd@



my_config.h: ../config.h

	$(CP) ../config.h my_config.h

include/config-win.h

+10 −0
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ functions */ 
#define _WIN32_WINNT     0x0500

#endif



#if defined(_MSC_VER) && _MSC_VER >= 1400

/* Avoid endless warnings about sprintf() etc. being unsafe. */

#define _CRT_SECURE_NO_DEPRECATE 1

#endif



#include <sys/locking.h>

#include <windows.h>

#include <math.h>			/* Because of rint() */
@@ -341,6 +346,11 @@ inline double ulonglong2double(ulonglong value) 
#define HAVE_SETFILEPOINTER

#define HAVE_VIO_READ_BUFF



#if defined(_WIN64) && defined(_M_X64)

/* Avoid type conflicts with built-in functions. */

#define HAVE_STRNLEN

#endif



#ifndef __NT__

#undef FILE_SHARE_DELETE

#define FILE_SHARE_DELETE 0     /* Not implemented on Win 98/ME */