Commit a1bc9040 authored by Joerg Bruehe's avatar Joerg Bruehe
Browse files

Merge main 5.1 -> 5.1-build

parents a9611262 0d2cbe95

BUILD/SETUP.sh

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ path=`dirname $0` 
. "$path/check-cpu"



export AM_MAKEFLAGS

AM_MAKEFLAGS="-j 4"

AM_MAKEFLAGS="-j 6"



# SSL library to use.--with-ssl will select our bundled yaSSL

# implementation of SSL. To use openSSl you will nee too point out
@@ -105,7 +105,7 @@ if [ "x$warning_mode" != "xpedantic" ]; then 
  cxx_warnings="$cxx_warnings -Wreorder"

  cxx_warnings="$cxx_warnings -Wctor-dtor-privacy -Wnon-virtual-dtor"

# Added unless --with-debug=full

  debug_extra_cflags="-O1 -Wuninitialized"

  debug_extra_cflags="-O0 -g3 -gdwarf-2" #1 -Wuninitialized"

else

  warnings="-W -Wall -ansi -pedantic -Wno-long-long -Wno-unused -D_POSIX_SOURCE"

  c_warnings="$warnings"

configure.in

+2 −2
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.30)

AM_INIT_AUTOMAKE(mysql, 5.1.31)

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



PROTOCOL_VERSION=10
@@ -2048,7 +2048,7 @@ AC_CHECK_FUNCS(alarm bcmp bfill bmove bsearch bzero \ 
  mkstemp mlockall perror poll pread pthread_attr_create mmap mmap64 getpagesize \

  pthread_attr_getstacksize pthread_attr_setprio pthread_attr_setschedparam \

  pthread_attr_setstacksize pthread_condattr_create pthread_getsequence_np \

  pthread_key_delete pthread_rwlock_rdlock pthread_setprio \

  pthread_key_delete pthread_rwlock_rdlock pthread_setprio pthread_setschedprio \

  pthread_setprio_np pthread_setschedparam pthread_sigmask readlink \

  realpath rename rint rwlock_init setupterm \

  shmget shmat shmdt shmctl sigaction sigemptyset sigaddset \

include/Makefile.am

+8 −5
Original line number Diff line number Diff line
@@ -15,8 +15,9 @@ 
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,

# MA 02111-1307, USA



BUILT_SOURCES =		$(HEADERS_GEN) link_sources

HEADERS_GEN =		mysql_version.h my_config.h

BUILT_SOURCES =		$(HEADERS_GEN_MAKE) link_sources

HEADERS_GEN_CONFIGURE =		mysql_version.h

HEADERS_GEN_MAKE =		my_config.h

HEADERS_ABI =		mysql.h mysql_com.h mysql_time.h \

			my_list.h my_alloc.h typelib.h mysql/plugin.h

pkginclude_HEADERS =	$(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \
@@ -25,7 +26,9 @@ pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \ 
			decimal.h errmsg.h my_global.h my_net.h \

			my_getopt.h sslopt-longopts.h my_dir.h \

			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \

			m_ctype.h my_attribute.h $(HEADERS_GEN)

			m_ctype.h my_attribute.h $(HEADERS_GEN_CONFIGURE) \

			$(HEADERS_GEN_MAKE)



noinst_HEADERS =	config-win.h config-netware.h my_bit.h \

			heap.h my_bitmap.h my_uctype.h \

			myisam.h myisampack.h myisammrg.h ft_global.h\
@@ -33,7 +36,7 @@ noinst_HEADERS = config-win.h config-netware.h my_bit.h \ 
			my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \

			my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \

			thr_lock.h t_ctype.h violite.h my_md5.h base64.h \

			mysql_version.h.in my_handler.h my_time.h \

			my_handler.h my_time.h \

			my_vle.h my_user.h my_atomic.h atomic/nolock.h \

			atomic/rwlock.h atomic/x86-gcc.h atomic/x86-msvc.h \

			atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h
@@ -45,7 +48,7 @@ CLEANFILES = $(BUILT_SOURCES) readline openssl 




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

DISTCLEANFILES =	sched.h $(CLEANFILES)

DISTCLEANFILES =	sched.h $(CLEANFILES) $(HEADERS_GEN_CONFIGURE)



link_sources:

	-$(RM) -f readline openssl

include/my_pthread.h

+3 −0
Original line number Diff line number Diff line
@@ -279,6 +279,8 @@ int sigwait(sigset_t *setp, int *sigp); /* Use our implemention */ 
#define my_pthread_setprio(A,B) pthread_setprio_np((A),(B))

#elif defined(HAVE_PTHREAD_SETPRIO)

#define my_pthread_setprio(A,B) pthread_setprio((A),(B))

#elif defined(HAVE_PTHREAD_SETSCHEDPRIO)

#define my_pthread_setprio(A,B) pthread_setschedprio((A),(B))

#else

extern void my_pthread_setprio(pthread_t thread_id,int prior);

#endif
@@ -519,6 +521,7 @@ typedef struct st_my_pthread_fastmutex_t 
{

  pthread_mutex_t mutex;

  uint spins;

  uint rng_state;

} my_pthread_fastmutex_t;

void fastmutex_global_init(void);

mysql-test/extra/rpl_tests/rpl_insert_id.test

+0 −2
Original line number Diff line number Diff line
@@ -442,8 +442,6 @@ SELECT f1(); 
INSERT INTO t1 VALUES (NULL, f2()), (NULL, LAST_INSERT_ID()),

                      (NULL, LAST_INSERT_ID()), (NULL, f2()), (NULL, f2());

INSERT INTO t1 VALUES (NULL, f2());

INSERT INTO t1 VALUES (NULL, LAST_INSERT_ID()), (NULL, LAST_INSERT_ID(5)),

                      (NULL, @@LAST_INSERT_ID);

# Test replication of substitution "IS NULL" -> "= LAST_INSERT_ID".

INSERT INTO t1 VALUES (NULL, 0), (NULL, LAST_INSERT_ID());

UPDATE t1 SET j= -1 WHERE i IS NULL;