Commit eb9cbe2c authored by monty@work.mysql.com's avatar monty@work.mysql.com
Browse files

merge

parents 51c9fd9c db61a345

Docs/manual.texi

+3 −0
Original line number Diff line number Diff line
@@ -47117,6 +47117,9 @@ not yet 100% confident in this code. 
@appendixsubsec Changes in release 3.23.43

@itemize @bullet

@item

Added unique error message when one gets a DEADLOCK during a transaction with

BDB tables.

@item

Fixed problem with @code{BDB} tables and @code{UNIQUE} columns defined

as @code{NULL}.

@item

client/mysqltest.c

+4 −0
Original line number Diff line number Diff line
@@ -1366,6 +1366,10 @@ int read_line(char* buf, int size) 
	*p = 0;

	return 0;

      }

      else if (c == '\'')

	state = R_Q1;

      else if (c == '"')

	state = R_Q2;

      else

	state = R_NORMAL;

      break;

extra/perror.c

+4 −0
Original line number Diff line number Diff line
@@ -67,6 +67,10 @@ static HA_ERRORS ha_errlist[]= 
  { 143,"Conflicting table definition between MERGE and mapped table"},

  { 144,"Table is crashed and last repair failed"},

  { 145,"Table was marked as crashed and should be repaired"},

  { 146,"Lock timed out; Retry transaction"},

  { 147,"Lock table is full;  Restart program with a larger locktable"},

  { 148,"Updates are not allowed under a read only transactions"},

  { 149,"Lock deadlock; Retry transaction"},

  { 0,NullS },

};

include/my_base.h

+1 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ enum ha_base_keytype { 
#define HA_ERR_LOCK_WAIT_TIMEOUT 146    

#define HA_ERR_LOCK_TABLE_FULL   147

#define HA_ERR_READ_ONLY_TRANSACTION 148 /* Updates not allowed */

#define HA_ERR_LOCK_DEADLOCK	 149



	/* Other constants */

include/mysql.h

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ extern "C" { 
  

#ifndef _global_h				/* If not standard header */

#include <sys/types.h>

#ifdef __LCC__

#include <winsock.h>				/* For windows */

#endif

typedef char my_bool;

#if (defined(_WIN32) || defined(_WIN64)) && !defined(__WIN__)

#define __WIN__