Commit b7b0008e authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql

parents 410847fa cb8bb9a8

Docs/manual.texi

+1 −3
Original line number Diff line number Diff line
@@ -46935,11 +46935,9 @@ InnoDB now supports @code{NULL} in keys. 
@item

Fixed shutdown problem on HPUX. (Introduced in 3.23.46)

@item

Added 'DO expression' command.

@item

Fixed core-dump bug in replication when using SELECT RELEASE_LOCK();

@item

Added new statement DO expression,[expression].

Added new command: @code{DO expression,[expression]}

@item

Added @code{slave-skip-errors} option

@item

client/client_priv.h

+2 −1
Original line number Diff line number Diff line
@@ -29,4 +29,5 @@ enum options { OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET, 
	       OPT_PAGER, OPT_NOPAGER, OPT_TEE, OPT_NOTEE,

	       OPT_LOW_PRIORITY, OPT_AUTO_REPAIR, OPT_COMPRESS,

	       OPT_DROP, OPT_LOCKS, OPT_KEYWORDS, OPT_DELAYED, OPT_OPTIMIZE,

	       OPT_FTB, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC, OPT_TABLES};
 
	       OPT_FTB, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC, OPT_TABLES,

	       OPT_MASTER_DATA, OPT_AUTOCOMMIT};

client/mysqldump.c

+250 −119

File changed.

Preview size limit exceeded, changes collapsed.

include/global.h

+2 −2
Original line number Diff line number Diff line
@@ -616,8 +616,8 @@ typedef unsigned long ulong; /* Short for unsigned long */ 
#endif

#ifndef longlong_defined

#if defined(HAVE_LONG_LONG) && SIZEOF_LONG != 8

typedef unsigned long long ulonglong;	/* ulong or unsigned long long */

typedef long long	longlong;

typedef unsigned long long int ulonglong; /* ulong or unsigned long long */

typedef long long int longlong;

#else

typedef unsigned long	ulonglong;	/* ulong or unsigned long long */

typedef long		longlong;