Commit 96a86081 authored by monty@donna.mysql.com's avatar monty@donna.mysql.com
Browse files

Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql

parents b7170cf9 8e4968d9

BUILD/compile-pentium-debug

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ extra_configs="$pentium_configs $debug_configs" 
# Use the debug version if it exists

if test -d /usr/local/BerkeleyDB-dbug/

then

 extra_configs="$extra_configs --with-berkeley-db=/usr/local/BerkeleyDB-dbug/"

 extra_configs="$extra_configs --with-berkeley-db=/usr/local/BerkeleyDB-dbug/ --with-innobase"

fi



. "$path/FINISH.sh"

include/mysqld_error.h

+2 −1
Original line number Diff line number Diff line
@@ -203,4 +203,5 @@ 
#define ER_BAD_SLAVE 1200

#define ER_MASTER_INFO 1201

#define ER_SLAVE_THREAD 1202

#define ER_ERROR_MESSAGES 203
 
#define ER_TOO_MANY_USER_CONNECTIONS 1203

#define ER_ERROR_MESSAGES 204

innobase/configure.in

+2 −1
Original line number Diff line number Diff line 
# Process this file with autoconf to produce a configure script

AC_INIT(./os/os0file.c)

AC_INIT

AM_MAINTAINER_MODE

AM_CONFIG_HEADER(ib_config.h)

AM_INIT_AUTOMAKE(ib, 0.90)

AC_PROG_CC

innobase/include/lock0types.h

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Created 5/7/1996 Heikki Tuuri 
#ifndef lock0types_h

#define lock0types_h



#define lock_t ib_lock_t

typedef struct lock_struct	lock_t;

typedef struct lock_sys_struct	lock_sys_t;

innobase/include/os0sync.h

+4 −4
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ struct os_event_struct { 
					fields */

	ibool		is_set;		/* this is TRUE if the next mutex is

					not reserved */

	os_fast_mutex_t	wait_mutex;	/* this mutex is used in waiting for

					the event */

	pthread_cond_t	cond_var;	/* condition variable is used in

					waiting for the event */

};

typedef struct os_event_struct os_event_struct_t;

typedef os_event_struct_t*     os_event_t;