List:Commits« Previous MessageNext Message »
From:marko.makela Date:September 9 2010 12:14pm
Subject:bzr push into mysql-5.5-innodb branch (marko.makela:3178)
View as plain text  
 3178 Marko Mäkelä	2010-09-09 [merge]
      Merge Vasil Dimov 2010-09-09 Enable UNIV_DEBUG when WITH_DEBUG is defined

    modified:
      storage/innobase/CMakeLists.txt
=== modified file 'storage/innobase/Doxyfile'
--- a/storage/innobase/Doxyfile	revid:vasil.dimov@stripped909100643-cocooto4dcnixxmh
+++ b/storage/innobase/Doxyfile	revid:marko.makela@strippediumjz7
@@ -565,7 +565,7 @@ RECURSIVE              = YES
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = ut0auxconf_*
+EXCLUDE                =
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
 # directories that are symbolic links (a Unix filesystem feature) are excluded

=== modified file 'storage/innobase/Makefile.am'
--- a/storage/innobase/Makefile.am	revid:vasil.dimov@strippeddcnixxmh
+++ b/storage/innobase/Makefile.am	revid:marko.makela@stripped
@@ -207,7 +207,6 @@ noinst_HEADERS=		\
 			include/usr0sess.h	\
 			include/usr0sess.ic	\
 			include/usr0types.h	\
-			include/ut0auxconf.h	\
 			include/ut0byte.h	\
 			include/ut0byte.ic	\
 			include/ut0dbg.h	\

=== modified file 'storage/innobase/compile-innodb'
--- a/storage/innobase/compile-innodb	revid:vasil.dimov@strippedcocooto4dcnixxmh
+++ b/storage/innobase/compile-innodb	revid:marko.makela@strippedz7
@@ -22,4 +22,4 @@ MYSQL_ROOT="$(dirname ${0})/../.."
 cd ${MYSQL_ROOT}
 
 cmake -DWITH_INNOBASE_STORAGE_ENGINE:BOOL=ON
-make -j4
+make -j$(nproc)

=== modified file 'storage/innobase/ibuf/ibuf0ibuf.c'
--- a/storage/innobase/ibuf/ibuf0ibuf.c	revid:vasil.dimov@stripped43-cocooto4dcnixxmh
+++ b/storage/innobase/ibuf/ibuf0ibuf.c	revid:marko.makela@stripped7iumjz7
@@ -3779,17 +3779,11 @@ ibuf_insert_to_index_page(
 	rec = page_rec_get_next(page_get_infimum_rec(page));
 
 	if (page_rec_is_supremum(rec)) {
-		/* Empty pages can result from buffered delete operations.
-		The first record from the free list can be used to find the
-		father node. */
-		rec = page_header_get_ptr(page, PAGE_FREE);
-		if (UNIV_UNLIKELY(rec == NULL)) {
-			fputs("InnoDB: Trying to insert a record from"
-			      " the insert buffer to an index page\n"
-			      "InnoDB: but the index page is empty!\n",
-			      stderr);
-			goto dump;
-		}
+		fputs("InnoDB: Trying to insert a record from"
+		      " the insert buffer to an index page\n"
+		      "InnoDB: but the index page is empty!\n",
+		      stderr);
+		goto dump;
 	}
 
 	if (UNIV_UNLIKELY(rec_get_n_fields(rec, index)

=== modified file 'storage/innobase/include/rem0rec.h'
--- a/storage/innobase/include/rem0rec.h	revid:vasil.dimov@stripped
+++ b/storage/innobase/include/rem0rec.h	revid:marko.makela@oracle.com-20100909121405-vvfiuolgr7iumjz7
@@ -806,8 +806,6 @@ rec_print(
 	dict_index_t*	index);	/*!< in: record descriptor */
 #endif /* UNIV_HOTBACKUP */
 
-#define REC_INFO_BITS		6	/* This is single byte bit-field */
-
 /* Maximum lengths for the data in a physical record if the offsets
 are given in one byte (resp. two byte) format. */
 #define REC_1BYTE_OFFS_LIMIT	0x7FUL

=== modified file 'storage/innobase/include/univ.i'
--- a/storage/innobase/include/univ.i	revid:vasil.dimov@stripped3-cocooto4dcnixxmh
+++ b/storage/innobase/include/univ.i	revid:marko.makela@strippedmjz7
@@ -78,19 +78,6 @@ the virtual method table (vtable) in GCC
 # define ha_innobase ha_innodb
 #endif /* MYSQL_DYNAMIC_PLUGIN */
 
-/* if any of the following macros is defined at this point this means
-that the code from the "right" plug.in was executed and we do not
-need to include ut0auxconf.h which would either define the same macros
-or will be empty */
-#if !defined(HAVE_IB_GCC_ATOMIC_BUILTINS) \
- && !defined(HAVE_IB_ATOMIC_PTHREAD_T_GCC) \
- && !defined(HAVE_IB_SOLARIS_ATOMICS) \
- && !defined(HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS) \
- && !defined(SIZEOF_PTHREAD_T) \
- && !defined(HAVE_IB_PAUSE_INSTRUCTION)
-# include "ut0auxconf.h"
-#endif
-
 #if (defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)) && !defined(MYSQL_SERVER) && !defined(__WIN__)
 # undef __WIN__
 # define __WIN__

=== removed file 'storage/innobase/include/ut0auxconf.h'
--- a/storage/innobase/include/ut0auxconf.h	revid:vasil.dimov@strippedto4dcnixxmh
+++ b/storage/innobase/include/ut0auxconf.h	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-/* Do not remove this file even though it is empty.
-This file is included in univ.i and will cause compilation failure
-if not present.
-A custom checks have been added in the generated
-storage/innobase/Makefile.in that is shipped with the InnoDB Plugin
-source archive. These checks eventually define some macros and put
-them in this file.
-This is a hack that has been developed in order to deploy new compile
-time checks without the need to regenerate the ./configure script that is
-distributed in the MySQL 5.1 official source archives.
-If by any chance Makefile.in and ./configure are regenerated and thus
-the hack from Makefile.in wiped away then the "real" checks from plug.in
-will take over.
-*/

=== removed file 'storage/innobase/ut/ut0auxconf_atomic_pthread_t_gcc.c'
--- a/storage/innobase/ut/ut0auxconf_atomic_pthread_t_gcc.c	revid:vasil.dimov@oracle.com-20100909100643-cocooto4dcnixxmh
+++ b/storage/innobase/ut/ut0auxconf_atomic_pthread_t_gcc.c	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 2009, Innobase Oy. All Rights Reserved.
-
-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., 59 Temple
-Place, Suite 330, Boston, MA 02111-1307 USA
-
-*****************************************************************************/
-
-/*****************************************************************************
-If this program compiles, then pthread_t objects can be used as arguments
-to GCC atomic builtin functions.
-
-Created March 5, 2009 Vasil Dimov
-*****************************************************************************/
-
-#include <pthread.h>
-#include <string.h>
-
-int
-main(int argc, char** argv)
-{
-	pthread_t	x1;
-	pthread_t	x2;
-	pthread_t	x3;
-
-	memset(&x1, 0x0, sizeof(x1));
-	memset(&x2, 0x0, sizeof(x2));
-	memset(&x3, 0x0, sizeof(x3));
-
-	__sync_bool_compare_and_swap(&x1, x2, x3);
-
-	return(0);
-}

=== removed file 'storage/innobase/ut/ut0auxconf_atomic_pthread_t_solaris.c'
--- a/storage/innobase/ut/ut0auxconf_atomic_pthread_t_solaris.c	revid:vasil.dimov@oracle.com-20100909100643-cocooto4dcnixxmh
+++ b/storage/innobase/ut/ut0auxconf_atomic_pthread_t_solaris.c	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 2009, Innobase Oy. All Rights Reserved.
-
-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., 59 Temple
-Place, Suite 330, Boston, MA 02111-1307 USA
-
-*****************************************************************************/
-
-/*****************************************************************************
-If this program compiles and returns 0, then pthread_t objects can be used as
-arguments to Solaris libc atomic functions.
-
-Created April 18, 2009 Vasil Dimov
-*****************************************************************************/
-
-#include <pthread.h>
-#include <string.h>
-
-int
-main(int argc, char** argv)
-{
-	pthread_t	x1;
-	pthread_t	x2;
-	pthread_t	x3;
-
-	memset(&x1, 0x0, sizeof(x1));
-	memset(&x2, 0x0, sizeof(x2));
-	memset(&x3, 0x0, sizeof(x3));
-
-	if (sizeof(pthread_t) == 4) {
-
-		atomic_cas_32(&x1, x2, x3);
-
-	} else if (sizeof(pthread_t) == 8) {
-
-		atomic_cas_64(&x1, x2, x3);
-
-	} else {
-
-		return(1);
-	}
-
-	return(0);
-}

=== removed file 'storage/innobase/ut/ut0auxconf_have_gcc_atomics.c'
--- a/storage/innobase/ut/ut0auxconf_have_gcc_atomics.c	revid:vasil.dimov@stripped
+++ b/storage/innobase/ut/ut0auxconf_have_gcc_atomics.c	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 2009, Innobase Oy. All Rights Reserved.
-
-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., 59 Temple
-Place, Suite 330, Boston, MA 02111-1307 USA
-
-*****************************************************************************/
-
-/*****************************************************************************
-If this program compiles and returns 0, then GCC atomic funcions are available.
-
-Created September 12, 2009 Vasil Dimov
-*****************************************************************************/
-
-int
-main(int argc, char** argv)
-{
-	long	x;
-	long	y;
-	long	res;
-	char	c;
-
-	x = 10;
-	y = 123;
-	res = __sync_bool_compare_and_swap(&x, x, y);
-	if (!res || x != y) {
-		return(1);
-	}
-
-	x = 10;
-	y = 123;
-	res = __sync_bool_compare_and_swap(&x, x + 1, y);
-	if (res || x != 10) {
-		return(1);
-	}
-
-	x = 10;
-	y = 123;
-	res = __sync_add_and_fetch(&x, y);
-	if (res != 123 + 10 || x != 123 + 10) {
-		return(1);
-	}
-
-	c = 10;
-	res = __sync_lock_test_and_set(&c, 123);
-	if (res != 10 || c != 123) {
-		return(1);
-	}
-
-	return(0);
-}

=== removed file 'storage/innobase/ut/ut0auxconf_have_solaris_atomics.c'
--- a/storage/innobase/ut/ut0auxconf_have_solaris_atomics.c	revid:vasil.dimov@stripped
+++ b/storage/innobase/ut/ut0auxconf_have_solaris_atomics.c	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 2009, Innobase Oy. All Rights Reserved.
-
-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., 59 Temple
-Place, Suite 330, Boston, MA 02111-1307 USA
-
-*****************************************************************************/
-
-/*****************************************************************************
-If this program compiles, then Solaris libc atomic funcions are available.
-
-Created April 18, 2009 Vasil Dimov
-*****************************************************************************/
-#include <atomic.h>
-
-int
-main(int argc, char** argv)
-{
-	ulong_t		ulong	= 0;
-	uint32_t	uint32	= 0;
-	uint64_t	uint64	= 0;
-
-	atomic_cas_ulong(&ulong, 0, 1);
-	atomic_cas_32(&uint32, 0, 1);
-	atomic_cas_64(&uint64, 0, 1);
-	atomic_add_long(&ulong, 0);
-
-	return(0);
-}

=== removed file 'storage/innobase/ut/ut0auxconf_pause.c'
--- a/storage/innobase/ut/ut0auxconf_pause.c	revid:vasil.dimov@stripped0643-cocooto4dcnixxmh
+++ b/storage/innobase/ut/ut0auxconf_pause.c	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 2009, Innobase Oy. All Rights Reserved.
-
-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., 59 Temple
-Place, Suite 330, Boston, MA 02111-1307 USA
-
-*****************************************************************************/
-
-/*****************************************************************************
-If this program compiles and can be run and returns 0, then the pause
-instruction is available.
-
-Created Jul 21, 2009 Vasil Dimov
-*****************************************************************************/
-
-int
-main(int argc, char** argv)
-{
-	__asm__ __volatile__ ("pause");
-
-	return(0);
-}

=== removed file 'storage/innobase/ut/ut0auxconf_sizeof_pthread_t.c'
--- a/storage/innobase/ut/ut0auxconf_sizeof_pthread_t.c	revid:vasil.dimov@strippedxmh
+++ b/storage/innobase/ut/ut0auxconf_sizeof_pthread_t.c	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 2009, Innobase Oy. All Rights Reserved.
-
-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., 59 Temple
-Place, Suite 330, Boston, MA 02111-1307 USA
-
-*****************************************************************************/
-
-/*****************************************************************************
-This program should compile and when run, print a single line like:
-#define SIZEOF_PTHREAD_T %d
-
-Created April 18, 2009 Vasil Dimov
-*****************************************************************************/
-
-#include <stdio.h>
-#include <pthread.h>
-
-int
-main(int argc, char** argv)
-{
-	printf("#define SIZEOF_PTHREAD_T %d\n", (int) sizeof(pthread_t));
-
-	return(0);
-}

Attachment: [text/bzr-bundle] bzr/marko.makela@oracle.com-20100909121405-vvfiuolgr7iumjz7.bundle
Thread
bzr push into mysql-5.5-innodb branch (marko.makela:3178) marko.makela9 Sep