Commit 13a4f0b3 authored by Chad MILLER's avatar Chad MILLER
Browse files

Merge from bk tree. Resolved addition of same files in both trees.

parents 8c490b78 94d237b1

Makefile.am

+6 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ tags: 
  test-pl test-force-pl test-full-pl test-force-full-pl test-force-pl-mem \

  test-unit test-ps test-nr test-pr test-ns test-binlog-statement \

  test-ext-funcs test-ext-rpl test-ext-partitions test-ext-jp \

  test-ext-stress test-ext test-embedded \

  test-ext-stress test-ext test-embedded test-reprepare \

  test-fast test-fast-cursor test-fast-view test-fast-prepare \

  test-full-qa
@@ -111,6 +111,11 @@ test-embedded: 
	  echo "no program found for 'embedded' tests - skipped testing" ; \

	fi



test-reprepare:

	cd mysql-test ; \

	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol \

		--mysqld=--debug=+d,reprepare_each_statement



test:	test-unit test-ns test-pr



test-full:	test test-nr test-ps

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM 
#

# When changing major version number please also check switch statement

# in mysqlbinlog::check_master_version().

AM_INIT_AUTOMAKE(mysql, 5.1.25-rc)

AM_INIT_AUTOMAKE(mysql, 5.1.26-rc)

AM_CONFIG_HEADER([include/config.h:config.h.in])



PROTOCOL_VERSION=10

include/errmsg.h

+2 −1
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ extern const char *client_errors[]; /* Error messages */ 
#define CR_NOT_IMPLEMENTED                      2054

#define CR_SERVER_LOST_EXTENDED			2055

#define CR_STMT_CLOSED				2056

#define CR_ERROR_LAST  /*Copy last error nr:*/  2056

#define CR_NEW_STMT_METADATA                    2057

#define CR_ERROR_LAST  /*Copy last error nr:*/  2057

/* Add error numbers before CR_ERROR_LAST and change it accordingly. */

include/my_global.h

+1 −1
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ typedef unsigned short ushort; 


#define CMP_NUM(a,b)    (((a) < (b)) ? -1 : ((a) == (b)) ? 0 : 1)

#define sgn(a)		(((a) < 0) ? -1 : ((a) > 0) ? 1 : 0)

#define swap_variables(t, a, b) { register t dummy; dummy= a; a= b; b= dummy; }

#define swap_variables(t, a, b) { t dummy; dummy= a; a= b; b= dummy; }

#define test(a)		((a) ? 1 : 0)

#define set_if_bigger(a,b)  do { if ((a) < (b)) (a)=(b); } while(0)

#define set_if_smaller(a,b) do { if ((a) > (b)) (a)=(b); } while(0)

include/my_sys.h

+3 −0
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ extern int NEAR my_errno; /* Last error in mysys */ 
#define ME_COLOUR1	((1 << ME_HIGHBYTE))	/* Possibly error-colours */

#define ME_COLOUR2	((2 << ME_HIGHBYTE))

#define ME_COLOUR3	((3 << ME_HIGHBYTE))

#define ME_FATALERROR   1024    /* Fatal statement error */

#define ME_NO_WARNING_FOR_ERROR 2048 /* Don't push a warning for error */

#define ME_NO_SP_HANDLER 4096 /* Don't call stored routine error handlers */



	/* Bits in last argument to fn_format */

#define MY_REPLACE_DIR		1	/* replace dir in name with 'dir' */