#At file:///home/mikael/mysql_clones/cache_alignment/
2849 Mikael Ronstrom 2009-06-18 [merge]
Merged in latest tree
modified:
.bzr-mysql/default.conf
cmd-line-utils/libedit/makelist.sh
cmd-line-utils/libedit/readline.c
cmd-line-utils/libedit/readline/readline.h
cmd-line-utils/libedit/vi.c
configure.in
include/Makefile.am
include/atomic/x86-gcc.h
mysys/Makefile.am
sql/Makefile.am
sql/sql_parse.cc
storage/csv/Makefile.am
storage/heap/Makefile.am
storage/innobase/CMakeLists.txt
storage/innobase/include/os0sync.ic
storage/innobase/include/univ.i
storage/innobase/win_atomics32_test.c
storage/innobase/win_atomics64_test.c
storage/myisam/Makefile.am
storage/myisammrg/Makefile.am
storage/ndb/src/common/util/version.c
support-files/Makefile.am
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf 2009-02-11 10:07:22 +0000
+++ b/.bzr-mysql/default.conf 2009-06-18 13:16:59 +0000
@@ -1,4 +1,4 @@
[MYSQL]
post_commit_to = "commits@stripped"
post_push_to = "commits@stripped"
-tree_name = "mysql-5.1"
+tree_name = "mysql-5.4"
=== modified file 'cmd-line-utils/libedit/makelist.sh'
--- a/cmd-line-utils/libedit/makelist.sh 2009-02-10 12:39:14 +0000
+++ b/cmd-line-utils/libedit/makelist.sh 2009-04-05 20:01:49 +0000
@@ -84,7 +84,7 @@ case $FLAG in
cat $FILES | $AWK '
BEGIN {
printf("/* Automatically generated file, do not edit */\n");
- printf("#include \"sys.h\"\n#include \"el.h\"\n");
+ printf("#include \"config.h\"\n#include \"el.h\"\n");
printf("private const struct el_bindings_t el_func_help[] = {\n");
low = "abcdefghijklmnopqrstuvwxyz_";
high = "ABCDEFGHIJKLMNOPQRSTUVWXYZ_";
@@ -169,7 +169,7 @@ case $FLAG in
cat $FILES | $AWK '/el_action_t/ { print $3 }' | sort | $AWK '
BEGIN {
printf("/* Automatically generated file, do not edit */\n");
- printf("#include \"sys.h\"\n#include \"el.h\"\n");
+ printf("#include \"config.h\"\n#include \"el.h\"\n");
printf("private const el_func_t el_func[] = {");
maxlen = 80;
needn = 1;
=== modified file 'cmd-line-utils/libedit/readline.c'
--- a/cmd-line-utils/libedit/readline.c 2009-02-10 12:39:14 +0000
+++ b/cmd-line-utils/libedit/readline.c 2009-04-05 20:01:49 +0000
@@ -51,13 +51,10 @@
#else
#include "np/vis.h"
#endif
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
+#include "readline/readline.h"
#include "el.h"
#include "fcns.h" /* for EL_NUM_FCNS */
#include "histedit.h"
-#include "readline/readline.h"
#include "filecomplete.h"
void rl_prep_terminal(int);
=== modified file 'cmd-line-utils/libedit/readline/readline.h'
--- a/cmd-line-utils/libedit/readline/readline.h 2009-02-10 12:39:14 +0000
+++ b/cmd-line-utils/libedit/readline/readline.h 2009-05-22 19:50:02 +0000
@@ -66,7 +66,7 @@ typedef KEYMAP_ENTRY *Keymap;
#ifndef CTRL
#include <sys/ioctl.h>
-#if !defined(__sun__) && !defined(__hpux__)
+#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__QNXNTO__) && !defined(__USLC__)
#include <sys/ttydefaults.h>
#endif
#ifndef CTRL
=== modified file 'cmd-line-utils/libedit/vi.c'
--- a/cmd-line-utils/libedit/vi.c 2009-02-10 12:39:14 +0000
+++ b/cmd-line-utils/libedit/vi.c 2009-04-05 20:01:49 +0000
@@ -914,14 +914,14 @@ vi_comment_out(EditLine *el, int c)
* NB: posix implies that we should enter insert mode, however
* this is against historical precedent...
*/
-#ifdef __weak_reference
+#if defined(__weak_reference) && !defined(__FreeBSD__)
extern char *get_alias_text(const char *) __weak_reference(get_alias_text);
#endif
protected el_action_t
/*ARGSUSED*/
vi_alias(EditLine *el, int c)
{
-#ifdef __weak_reference
+#if defined(__weak_reference) && !defined(__FreeBSD__)
char alias_name[3];
char *alias_text;
=== modified file 'configure.in'
--- a/configure.in 2009-02-23 23:37:08 +0000
+++ b/configure.in 2009-06-12 15:22:42 +0000
@@ -9,8 +9,8 @@ AC_CANONICAL_SYSTEM
# remember to also update version.c in ndb
#
# When changing major version number please also check switch statement
-# in mysqlbinlog::check_master_version().
-AM_INIT_AUTOMAKE(mysql, 5.1.33-pv-0.2.2)
+# in client/mysqlbinlog.cc:check_master_version().
+AM_INIT_AUTOMAKE(mysql, 5.4.2-beta)
AM_CONFIG_HEADER([include/config.h:config.h.in])
PROTOCOL_VERSION=10
=== modified file 'include/Makefile.am'
--- a/include/Makefile.am 2009-04-03 13:52:59 +0000
+++ b/include/Makefile.am 2009-04-05 20:18:21 +0000
@@ -15,7 +15,7 @@
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA
-BUILT_SOURCES = $(HEADERS_GEN_MAKE) link_sources
+BUILT_SOURCES = $(HEADERS_GEN_MAKE) link_sources probes_mysql_nodtrace.h
HEADERS_GEN_CONFIGURE = mysql_version.h
HEADERS_GEN_MAKE = my_config.h
HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \
@@ -40,8 +40,7 @@ noinst_HEADERS = config-win.h config-net
my_vle.h my_user.h my_atomic.h atomic/nolock.h \
atomic/rwlock.h atomic/x86-gcc.h atomic/x86-msvc.h \
atomic/solaris.h \
- atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h \
- probes_mysql.h probes_mysql_nodtrace.h
+ atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h
EXTRA_DIST = mysql.h.pp mysql/plugin.h.pp probes_mysql.d.base
@@ -77,7 +76,7 @@ probes_mysql.d:
DTRACEPROVIDER = probes_mysql.d
if HAVE_DTRACE
BUILT_SOURCES += probes_mysql_dtrace.h
-CLEANFILES += probes_mysql_dtrace.h
+CLEANFILES += $(DTRACEPROVIDER)
# Fake for creating the probes file. If we are building a separate directory
# then we copy the probes from the source location and use that
=== modified file 'include/atomic/x86-gcc.h'
--- a/include/atomic/x86-gcc.h 2006-12-27 01:23:51 +0000
+++ b/include/atomic/x86-gcc.h 2009-06-10 10:23:02 +0000
@@ -35,7 +35,7 @@
asm volatile (LOCK "; xadd %0, %1;" : "+r" (v) , "+m" (*a))
#endif
#define make_atomic_swap_body(S) \
- asm volatile ("; xchg %0, %1;" : "+r" (v) , "+m" (*a))
+ asm volatile ("; xchg %0, %1;" : "+q" (v) , "+m" (*a))
#define make_atomic_cas_body(S) \
asm volatile (LOCK "; cmpxchg %3, %0; setz %2;" \
: "+m" (*a), "+a" (*cmp), "=q" (ret): "r" (set))
=== modified file 'mysys/Makefile.am'
--- a/mysys/Makefile.am 2009-03-18 10:04:15 +0000
+++ b/mysys/Makefile.am 2009-04-05 20:18:21 +0000
@@ -132,6 +132,7 @@ libmysys_a_DEPENDENCIES += probes_mysql.
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = mf_keycache.o
DTRACEPROVIDER = probes_mysql.d
+CLEANFILES += $(DTRACEPROVIDER) dtrace_sources
dtrace_files:
echo $(DTRACEFILES) > $@
=== modified file 'sql/Makefile.am'
--- a/sql/Makefile.am 2009-03-18 10:04:15 +0000
+++ b/sql/Makefile.am 2009-04-05 20:18:21 +0000
@@ -229,6 +229,7 @@ mysqld_LDADD += probes_all.o
mysqld_DEPENDENCIES += dtrace_files dtrace_providers probes_all.o
CLEANFILES += dtrace_files dtrace_providers probes_all.o
DTRACEPROVIDER = probes_mysql.d
+CLEANFILES += $(DTRACEPROVIDER)
dtrace_files:
echo $(DTRACEFILES) > $@
=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc 2009-02-17 12:24:09 +0000
+++ b/sql/sql_parse.cc 2009-06-03 06:09:49 +0000
@@ -6038,7 +6038,7 @@ bool add_field_to_list(THD *thd, LEX_STR
*/
char buf[32];
my_snprintf(buf, sizeof(buf), "TIMESTAMP(%s)", length);
- WARN_DEPRECATED(thd, "5.2", buf, "'TIMESTAMP'");
+ WARN_DEPRECATED(thd, "6.0", buf, "'TIMESTAMP'");
}
if (!(new_field= new Create_field()) ||
=== modified file 'storage/csv/Makefile.am'
--- a/storage/csv/Makefile.am 2009-03-18 10:04:15 +0000
+++ b/storage/csv/Makefile.am 2009-04-05 20:18:21 +0000
@@ -48,6 +48,7 @@ libcsv_a_DEPENDENCIES = probes_mysql.o d
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = libcsv_a-ha_tina.o
DTRACEPROVIDER = probes_mysql.d
+CLEANFILES += $(DTRACEPROVIDER) dtrace_sources
dtrace_files:
echo $(DTRACEFILES) > $@
=== modified file 'storage/heap/Makefile.am'
--- a/storage/heap/Makefile.am 2009-03-18 10:04:15 +0000
+++ b/storage/heap/Makefile.am 2009-04-05 20:18:21 +0000
@@ -57,6 +57,7 @@ libheap_a_DEPENDENCIES = probes_mysql.o
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = ha_heap.o
DTRACEPROVIDER = probes_mysql.d
+CLEANFILES += $(DTRACEPROVIDER) dtrace_sources
dtrace_files:
echo $(DTRACEFILES) > $@
=== modified file 'storage/innobase/CMakeLists.txt'
--- a/storage/innobase/CMakeLists.txt 2009-03-06 23:12:36 +0000
+++ b/storage/innobase/CMakeLists.txt 2009-06-17 17:16:49 +0000
@@ -31,16 +31,18 @@ IF (NOT WITHOUT_ATOMICS)
# Check for 64 bit atomics
TRY_RUN(RUN_RES COMPILE_RES ${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/storage/innobase/win_atomics64_test.c)
- IF (RUN_RES)
+ IF (COMPILE_RES AND NOT RUN_RES)
+ MESSAGE("Adding support for Win64 atomics")
ADD_DEFINITIONS(-DWIN_ATOMICS64)
- ENDIF (RUN_RES)
+ ENDIF (COMPILE_RES AND NOT RUN_RES)
ELSE (CMAKE_SIZEOF_VOID_P MATCHES 8)
# Check for 32 bit atomics
TRY_RUN(RUN_RES COMPILE_RES ${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/storage/innobase/win_atomics32_test.c)
- IF (RUN_RES)
+ IF (COMPILE_RES AND NOT RUN_RES)
+ MESSAGE("Adding support for Win32 atomics")
ADD_DEFINITIONS(-DWIN_ATOMICS32)
- ENDIF (RUN_RES)
+ ENDIF (COMPILE_RES AND NOT RUN_RES)
ENDIF (CMAKE_SIZEOF_VOID_P MATCHES 8)
ENDIF (NOT WITHOUT_ATOMICS)
=== modified file 'storage/innobase/include/os0sync.ic'
--- a/storage/innobase/include/os0sync.ic 2009-03-06 18:25:38 +0000
+++ b/storage/innobase/include/os0sync.ic 2009-06-16 13:16:15 +0000
@@ -142,9 +142,9 @@ os_atomic_increment(
#elif HAVE_SOLARIS_ATOMIC
return ((lint)atomic_add_long_nv((volatile ulong_t *)ptr, amount));
#elif WIN_ATOMICS32
- return ((lint)InterlockedExchangeAdd(ptr, amount));
+ return ((lint)InterlockedExchangeAdd(ptr, amount) + amount);
#elif WIN_ATOMICS64
- return ((lint)InterlockedExchangeAdd64(ptr, amount));
+ return ((lint)InterlockedExchangeAdd64(ptr, amount) + amount);
#else
#error "Need support for atomic ops"
#endif
=== modified file 'storage/innobase/include/univ.i'
--- a/storage/innobase/include/univ.i 2009-03-06 18:25:38 +0000
+++ b/storage/innobase/include/univ.i 2009-06-10 10:23:02 +0000
@@ -67,20 +67,6 @@ of the 32-bit x86 assembler in mutex ope
# define UNIV_MUST_NOT_INLINE
# endif
-/* When on Solaris, gcc, and 32-bit disable inlining */
-
-# if defined(__GNUC__) && defined(UNIV_SOLARIS) && defined(__i386__)
-# undef UNIV_MUST_NOT_INLINE
-# define UNIV_MUST_NOT_INLINE
-# endif
-
-/* When on Mac OS X, gcc, and 32-bit x86 disable inlining */
-
-# if defined(__GNUC__) && defined(__APPLE__) && defined (__MACH__) && defined(__i386__)
-# undef UNIV_MUST_NOT_INLINE
-# define UNIV_MUST_NOT_INLINE
-# endif
-
# ifdef HAVE_PREAD
# define HAVE_PWRITE
# endif
=== modified file 'storage/innobase/win_atomics32_test.c'
--- a/storage/innobase/win_atomics32_test.c 2009-03-06 18:25:38 +0000
+++ b/storage/innobase/win_atomics32_test.c 2009-06-16 13:16:15 +0000
@@ -1,17 +1,17 @@
-# Copyright (C) 2009 Sun Microsystems AB
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+/* Copyright (C) 2009 Sun Microsystems AB
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
#include <windows.h>
=== modified file 'storage/innobase/win_atomics64_test.c'
--- a/storage/innobase/win_atomics64_test.c 2009-03-06 18:25:38 +0000
+++ b/storage/innobase/win_atomics64_test.c 2009-06-16 13:16:15 +0000
@@ -1,17 +1,18 @@
-# Copyright (C) 2009 Sun Microsystems AB
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+/* Copyright (C) 2009 Sun Microsystems AB
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
+
#include <windows.h>
int main()
=== modified file 'storage/myisam/Makefile.am'
--- a/storage/myisam/Makefile.am 2009-03-18 10:04:15 +0000
+++ b/storage/myisam/Makefile.am 2009-04-05 20:18:21 +0000
@@ -156,6 +156,7 @@ libmyisam_a_DEPENDENCIES = probes_mysql.
CLEANFILES += probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = ha_myisam.o
DTRACEPROVIDER = probes_mysql.d
+CLEANFILES += $(DTRACEPROVIDER) dtrace_sources
dtrace_files:
echo $(DTRACEFILES) > $@
=== modified file 'storage/myisammrg/Makefile.am'
--- a/storage/myisammrg/Makefile.am 2009-03-18 10:04:15 +0000
+++ b/storage/myisammrg/Makefile.am 2009-04-05 20:18:21 +0000
@@ -46,6 +46,7 @@ libmyisammrg_a_DEPENDENCIES = probes_mys
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = ha_myisammrg.o
DTRACEPROVIDER = probes_mysql.d
+CLEANFILES += $(DTRACEPROVIDER) dtrace_sources
dtrace_files:
echo $(DTRACEFILES) > $@
=== modified file 'storage/ndb/src/common/util/version.c'
--- a/storage/ndb/src/common/util/version.c 2007-07-11 12:36:44 +0000
+++ b/storage/ndb/src/common/util/version.c 2009-05-22 19:05:46 +0000
@@ -98,7 +98,7 @@ void ndbSetOwnVersion() {}
#ifndef TEST_VERSION
struct NdbUpGradeCompatible ndbCompatibleTable_full[] = {
- { MAKE_VERSION(5,1,NDB_VERSION_BUILD), MAKE_VERSION(5,1,18), UG_Range},
+ { MAKE_VERSION(5,4,NDB_VERSION_BUILD), MAKE_VERSION(5,1,18), UG_Range},
{ MAKE_VERSION(5,1,17), MAKE_VERSION(5,1,0), UG_Range},
{ MAKE_VERSION(5,0,NDB_VERSION_BUILD), MAKE_VERSION(5,0,12), UG_Range},
{ MAKE_VERSION(5,0,11), MAKE_VERSION(5,0,2), UG_Range},
=== modified file 'support-files/Makefile.am'
--- a/support-files/Makefile.am 2008-01-24 18:04:48 +0000
+++ b/support-files/Makefile.am 2009-04-16 17:06:32 +0000
@@ -33,7 +33,8 @@ EXTRA_DIST = mysql.spec.sh \
magic mysql.m4 \
MySQL-shared-compat.spec.sh \
ndb-config-2-node.ini.sh \
- compiler_warnings.supp
+ compiler_warnings.supp \
+ dtrace
SUBDIRS = MacOSX RHEL4-SElinux
| Thread |
|---|
| • bzr commit into mysql-5.4 branch (mikael:2849) | Mikael Ronstrom | 18 Jun |
