Below is the list of changes that have just been committed into a local
5.1 repository of iggy. When iggy does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2006-09-28 15:26:39-04:00, iggy@stripped +2 -0
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug22224/my50-bug22224
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug22224/my51-bug22224
MERGE: 1.1810.1697.167
BitKeeper/deleted/.del-CMakeLists.txt~1@stripped, 2006-09-28 15:26:07-04:00, iggy@stripped +2 -4
ul
ul
?
MERGE: 1.1.1.2
BitKeeper/deleted/.del-CMakeLists.txt~1@stripped, 2006-09-28 15:25:05-04:00, iggy@stripped +0 -0
Merge rename: CMakeLists.txt -> BitKeeper/deleted/.del-CMakeLists.txt~1
storage/innobase/include/univ.i@stripped, 2006-09-28 15:26:28-04:00, iggy@stripped +0 -2
MERGE: 1.40.7.2
storage/innobase/include/univ.i@stripped, 2006-09-28 15:25:05-04:00, iggy@stripped +0 -0
Merge rename: innobase/include/univ.i -> storage/innobase/include/univ.i
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: iggy
# Host: rolltop.ignatz42.dyndns.org
# Root: /mnt/storeage/bug22224/my51-bug22224/RESYNC
--- 1.1.1.1/CMakeLists.txt 2006-09-28 15:26:46 -04:00
+++ 1.3/BitKeeper/deleted/.del-CMakeLists.txt~1 2006-09-28 15:26:46 -04:00
@@ -29,6 +29,8 @@
ENDIF (WITH_MYISAMMRG_STORAGE_ENGINE)
IF(WITH_INNOBASE_STORAGE_ENGINE)
+ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/innobase/ib_config.h.in
+ ${CMAKE_SOURCE_DIR}/innobase/ib_config.h @ONLY)
ADD_DEFINITIONS(-D HAVE_INNOBASE_DB)
ADD_DEFINITIONS(-D WITH_INNOBASE_STORAGE_ENGINE)
SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_innobase_plugin")
@@ -121,12 +123,8 @@
ADD_SUBDIRECTORY(myisam)
ADD_SUBDIRECTORY(myisammrg)
ADD_SUBDIRECTORY(client)
-IF(WITH_BERKELEY_STORAGE_ENGINE)
ADD_SUBDIRECTORY(bdb)
-ENDIF(WITH_BERKELEY_STORAGE_ENGINE)
-IF(WITH_INNOBASE_STORAGE_ENGINE)
ADD_SUBDIRECTORY(innobase)
-ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
ADD_SUBDIRECTORY(sql)
ADD_SUBDIRECTORY(sql/examples)
ADD_SUBDIRECTORY(server-tools/instance-manager)
--- 1.40.7.1/innobase/include/univ.i 2006-09-28 15:26:46 -04:00
+++ 1.57/storage/innobase/include/univ.i 2006-09-28 15:26:46 -04:00
@@ -39,9 +39,9 @@
#undef PACKAGE
#undef VERSION
-#if !defined(__WIN__) && !defined(WIN64) && !defined(_WIN64)
/* Include the header file generated by GNU autoconf */
-#include "../ib_config.h"
+#ifndef __WIN__
+#include "config.h"
#endif
#ifdef HAVE_SCHED_H
@@ -82,7 +82,7 @@
/* Make a non-inline debug version */
-/*
+#if 0
#define UNIV_DEBUG
#define UNIV_MEM_DEBUG
#define UNIV_IBUF_DEBUG
@@ -90,11 +90,12 @@
#define UNIV_SEARCH_DEBUG
#define UNIV_SYNC_PERF_STAT
#define UNIV_SEARCH_PERF_STAT
-#define UNIV_SRV_PRINT_LATCH_WAITS;
-*/
-#define UNIV_LIGHT_MEM_DEBUG
+#define UNIV_SRV_PRINT_LATCH_WAITS
+#define UNIV_BTR_PRINT
+#endif
-#define YYDEBUG 1
+#define UNIV_BTR_DEBUG
+#define UNIV_LIGHT_MEM_DEBUG
#ifdef HAVE_purify
/* The following sets all new allocated memory to zero before use:
@@ -124,7 +125,7 @@
#ifdef __WIN__
#define UNIV_INLINE __inline
#else
-#define UNIV_INLINE static inline
+#define UNIV_INLINE static __inline__
#endif
#else
@@ -161,7 +162,7 @@
#define UNIV_PAGE_SIZE (2 * 8192) /* NOTE! Currently, this has to be a
power of 2 */
/* The 2-logarithm of UNIV_PAGE_SIZE: */
-#define UNIV_PAGE_SIZE_SHIFT 14
+#define UNIV_PAGE_SIZE_SHIFT 14
/* Maximum number of parallel threads in a parallelized operation */
#define UNIV_MAX_PARALLELISM 32
@@ -174,6 +175,16 @@
/* Note that inside MySQL 'byte' is defined as char on Linux! */
#define byte unsigned char
+/* Define an unsigned integer type that is exactly 32 bits. */
+
+#if SIZEOF_INT == 4
+typedef unsigned int ib_uint32_t;
+#elif SIZEOF_LONG == 4
+typedef unsigned long ib_uint32_t;
+#else
+#error "Neither int or long is 4 bytes"
+#endif
+
/* Another basic type we use is unsigned long integer which should be equal to
the word size of the machine, that is on a 32-bit platform 32 bits, and on a
64-bit platform 64 bits. We also give the printf format for the type as a
@@ -201,9 +212,6 @@
#endif
#endif
-/* The following type should be at least a 64-bit floating point number */
-typedef double utfloat;
-
/* The 'undefined' value for a ulint */
#define ULINT_UNDEFINED ((ulint)(-1))
@@ -230,7 +238,7 @@
on disk, we must have also this number fit in 32 bits, also in 64-bit
computers! */
-#define UNIV_SQL_NULL ULINT32_UNDEFINED
+#define UNIV_SQL_NULL ULINT32_UNDEFINED
/* Lengths which are not UNIV_SQL_NULL, but bigger than the following
number indicate that a field contains a reference to an externally
@@ -265,6 +273,18 @@
/* Compile-time constant of the given array's size. */
#define UT_ARR_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+
+/* The return type from a thread's start function differs between Unix and
+Windows, so define a typedef for it and a macro to use at the end of such
+functions. */
+
+#ifdef __WIN__
+typedef ulint os_thread_ret_t;
+#define OS_THREAD_DUMMY_RETURN return(0)
+#else
+typedef void* os_thread_ret_t;
+#define OS_THREAD_DUMMY_RETURN return(NULL)
+#endif
#include <stdio.h>
#include "ut0dbg.h"
| Thread |
|---|
| • bk commit into 5.1 tree (iggy:1.2332) | Ignacio Galarza | 28 Sep |
