2795 MySQL Build Team 2008-12-04 [merge]
Merge
modified:
Makefile.am
configure.in
include/waiting_threads.h
mysys/lf_hash.c
mysys/waiting_threads.c
sql/backup/kernel.cc
storage/myisam/myisam_backup_engine.cc
support-files/mysql.spec.sh
2794 Timothy Smith 2008-12-02 [merge]
Merge 5.1-build into 6.0-build. This pulls in the 5.1.30 changes (mostly
copyright notice changes) and a few build-related modifications.
removed:
mysql-test/suite/funcs_1/r/ndb_trig_0102.result.moved
mysql-test/suite/funcs_1/r/ndb_trig_03.result.moved
mysql-test/suite/funcs_1/r/ndb_trig_0407.result.moved
mysql-test/suite/funcs_1/r/ndb_trig_08.result.moved
mysql-test/suite/funcs_1/r/ndb_trig_09.result.moved
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result.moved
mysql-test/suite/funcs_1/t/ndb_trig_0102.test.moved
mysql-test/suite/funcs_1/t/ndb_trig_03.test.moved
mysql-test/suite/funcs_1/t/ndb_trig_0407.test.moved
mysql-test/suite/funcs_1/t/ndb_trig_08.test.moved
mysql-test/suite/funcs_1/t/ndb_trig_09.test.moved
mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test.moved
modified:
Makefile.am
client/mysql.cc
client/mysqladmin.cc
client/mysqldump.c
client/mysqlimport.c
client/mysqlshow.c
client/mysqlslap.c
configure.in
include/config-win.h
include/hash.h
include/thr_lock.h
mysql-test/lib/mtr_report.pl
mysql-test/r/partition.result
mysql-test/t/partition.test
mysys/hash.c
sql/event_db_repository.cc
sql/event_parse_data.cc
sql/event_parse_data.h
sql/field.cc
sql/field.h
sql/gen_lex_hash.cc
sql/ha_partition.cc
sql/ha_partition.h
sql/handler.cc
sql/handler.h
sql/item.cc
sql/item.h
sql/item_func.cc
sql/item_func.h
sql/lock.cc
sql/log.cc
sql/log_event.cc
sql/mysql_priv.h
sql/mysqld.cc
sql/opt_range.cc
sql/partition_info.h
sql/set_var.cc
sql/sp_head.cc
sql/sql_base.cc
sql/sql_cache.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_insert.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_parse.cc
sql/sql_partition.cc
sql/sql_select.cc
sql/sql_show.cc
sql/sql_show.h
sql/sql_table.cc
sql/sql_union.cc
sql/sql_update.cc
sql/sql_yacc.yy
sql/table.cc
sql/table.h
storage/archive/archive_reader.c
storage/blackhole/ha_blackhole.cc
storage/blackhole/ha_blackhole.h
storage/myisam/myisampack.c
storage/ndb/docs/doxygen/postdoxy.pl
storage/ndb/test/tools/connect.cpp
strings/conf_to_src.c
support-files/mysql.spec.sh
=== modified file 'Makefile.am'
--- a/Makefile.am 2008-12-02 22:56:19 +0000
+++ b/Makefile.am 2008-12-04 17:28:21 +0000
@@ -178,8 +178,8 @@ test-bt:
fi
-if [ -d mysql-test/suite/nist ] ; then \
cd mysql-test ; MTR_BUILD_THREAD=auto \
+ @PERL@ ./mysql-test-run.pl --comment=NIST+normal --force --suite=nist ; \
@PERL@ ./mysql-test-run.pl --comment=NIST+ps --force --suite=nist --ps-protocol ; \
- @PERL@ ./mysql-test-run.pl --comment=nist+ps --force --suite=nist --ps-protocol ; \
fi
-if [ -e bin/mysqltest_embedded -o -e libmysqld/examples/mysqltest_embedded ] ; then \
cd mysql-test ; MTR_BUILD_THREAD=auto \
=== modified file 'configure.in'
--- a/configure.in 2008-12-02 22:56:19 +0000
+++ b/configure.in 2008-12-04 17:28:21 +0000
@@ -403,7 +403,7 @@ fi
MYSQL_PROG_AR
# libmysqlclient versioning when linked with GNU ld.
-if $LD --version 2>/dev/null| grep GNU >/dev/null 2>&1; then
+if $LD --version 2>/dev/null | grep GNU >/dev/null 2>&1; then
LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/libmysql/libmysql.ver"
AC_CONFIG_FILES(libmysql/libmysql.ver)
fi
=== modified file 'include/waiting_threads.h'
--- a/include/waiting_threads.h 2008-10-27 22:23:34 +0000
+++ b/include/waiting_threads.h 2008-11-03 19:59:23 +0000
@@ -30,13 +30,11 @@ typedef struct st_wt_resource_type {
const void *(*make_key)(WT_RESOURCE_ID *id, uint *len);
} WT_RESOURCE_TYPE;
-/* we want to compare this struct with memcmp, make it packed */
-#pragma pack(1)
struct st_wt_resource_id {
ulonglong value;
WT_RESOURCE_TYPE *type;
};
-#pragma pack()
+#define sizeof_WT_RESOURCE_ID (sizeof(ulonglong)+sizeof(void*))
#define WT_WAIT_STATS 24
#define WT_CYCLE_STATS 32
=== modified file 'mysys/lf_hash.c'
--- a/mysys/lf_hash.c 2008-07-29 14:10:24 +0000
+++ b/mysys/lf_hash.c 2008-11-03 19:59:23 +0000
@@ -281,8 +281,9 @@ static inline const uchar* hash_key(cons
}
/*
- compute the hash key value from the raw key.
- note, that the hash value is limited to 2^31, because we need one
+ Compute the hash key value from the raw key.
+
+ @note, that the hash value is limited to 2^31, because we need one
bit to distinguish between normal and dummy nodes.
*/
static inline uint calc_hash(LF_HASH *hash, const uchar *key, uint keylen)
@@ -300,7 +301,7 @@ static int initialize_bucket(LF_HASH *,
/*
Initializes lf_hash, the arguments are compatible with hash_init
- @@note element_size sets both the size of allocated memory block for
+ @note element_size sets both the size of allocated memory block for
lf_alloc and a size of memcpy'ed block size in lf_hash_insert. Typically
they are the same, indeed. But LF_HASH::element_size can be decreased
after lf_hash_init, and then lf_alloc will allocate larger block that
=== modified file 'mysys/waiting_threads.c'
--- a/mysys/waiting_threads.c 2008-10-24 10:34:08 +0000
+++ b/mysys/waiting_threads.c 2008-11-03 19:59:23 +0000
@@ -280,7 +280,7 @@ void wt_init()
DBUG_ENTER("wt_init");
lf_hash_init(&reshash, sizeof(WT_RESOURCE), LF_HASH_UNIQUE, 0,
- sizeof(struct st_wt_resource_id), 0, 0);
+ sizeof_WT_RESOURCE_ID, 0, 0);
reshash.alloc.constructor= wt_resource_init;
reshash.alloc.destructor= wt_resource_destroy;
/*
@@ -396,9 +396,7 @@ void wt_thd_destroy(WT_THD *thd)
*/
int wt_resource_id_memcmp(void *a, void *b)
{
- /* assert that the structure is not padded with random bytes */
- compile_time_assert(sizeof(WT_RESOURCE_ID)==sizeof(ulonglong)+sizeof(void*));
- return memcmp(a, b, sizeof(WT_RESOURCE_ID));
+ return memcmp(a, b, sizeof_WT_RESOURCE_ID);
}
/**
@@ -657,7 +655,7 @@ static int unlock_lock_and_free_resource
/* XXX if (rc->id.type->make_key) key= rc->id.type->make_key(&rc->id, &keylen); else */
{
key= &rc->id;
- keylen= sizeof(rc->id);
+ keylen= sizeof_WT_RESOURCE_ID;
}
/*
@@ -751,7 +749,7 @@ int wt_thd_will_wait_for(WT_THD *thd, WT
/* XXX if (restype->make_key) key= restype->make_key(resid, &keylen); else */
{
key= resid;
- keylen= sizeof(*resid);
+ keylen= sizeof_WT_RESOURCE_ID;
}
DBUG_PRINT("wt", ("first blocker"));
=== modified file 'sql/backup/kernel.cc'
--- a/sql/backup/kernel.cc 2008-11-13 08:40:43 +0000
+++ b/sql/backup/kernel.cc 2008-12-04 17:28:21 +0000
@@ -915,7 +915,6 @@ void Backup_restore_ctx::unlock_tables()
@return error code given as input or stored in the context object if
a fatal error was reported before.
*/
-inline
int Backup_restore_ctx::log_error(int error_code, ...)
{
if (m_error)
=== modified file 'storage/myisam/myisam_backup_engine.cc'
--- a/storage/myisam/myisam_backup_engine.cc 2008-08-11 16:06:30 +0000
+++ b/storage/myisam/myisam_backup_engine.cc 2008-11-02 23:38:05 +0000
@@ -257,6 +257,9 @@ private:
size_t bytes_since_last_sleep; ///< how many bytes sent since we last slept
};
+/* Needed for VisualAge 6.0 */
+const size_t Backup::bytes_between_sleeps;
+
/**
When we send a backup packet to the backup kernel, we prefix it with a code
which tells which type of file this packet belongs to. Starts at 1 because
=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh 2008-12-02 22:56:19 +0000
+++ b/support-files/mysql.spec.sh 2008-12-04 17:28:21 +0000
@@ -15,6 +15,7 @@
# MA 02110-1301 USA.
%define mysql_version @VERSION@
+%define mysql_vendor MySQL AB
# NOTE: "vendor" is used in upgrade/downgrade check, so you can't
# change these, has to be exactly as is.
@@ -31,10 +32,14 @@
%{?_with_yassl:%define YASSL_BUILD 1}
%{!?_with_yassl:%define YASSL_BUILD 0}
-# use "rpmbuild --with maria" or "rpm --define '_with_maria 1'" (for RPM 3.x)
-# to build with maria support (off by default)
-%{?_with_maria:%define MARIA_BUILD 1}
-%{!?_with_maria:%define MARIA_BUILD 0}
+# use "rpmbuild --with falcon" or "rpm --define '_with_falcon 1'" (for RPM 3.x)
+# to build with falcon support (off by default)
+#
+# Note: No default --with-falcon, as generic RPM is compiled with gcc 3.x.
+# Falcon requires gcc 4.x that requires libstdc++.6 that is not on most
+# "older" Linux systems.
+%{?_with_falcon:%define FALCON_BUILD 1}
+%{!?_with_falcon:%define FALCON_BUILD 0}
# use "rpmbuild --with cluster" or "rpm --define '_with_cluster 1'" (for RPM 3.x)
# to build with cluster support (off by default)
@@ -292,28 +297,26 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH
--mandir=%{_mandir} \
--enable-thread-safe-client \
--with-readline \
- --with-innodb \
+ --with-innodb \
%if %{CLUSTER_BUILD}
- --with-ndbcluster \
+ --with-ndbcluster \
%else
- --without-ndbcluster \
+ --without-ndbcluster \
%endif
- --with-archive-storage-engine \
- --with-csv-storage-engine \
- --with-blackhole-storage-engine \
- --with-federated-storage-engine \
-%ifarch i386 x86_64
- --with-falcon \
+ --with-plugin-archive \
+ --with-plugin-csv \
+ --with-plugin-blackhole \
+ --with-plugin-federated \
+%if %{FALCON_BUILD}
+ --with-plugin-falcon \
%else
- --without-falcon \
+ --without-plugin-falcon \
%endif
-%if %{MARIA_BUILD}
- --with-plugin-maria \
- --with-maria-tmp-tables \
-%endif
- --with-partition \
- --with-big-tables \
- --enable-shared \
+ --with-plugin-maria \
+ --with-maria-tmp-tables \
+ --with-plugin-partition \
+ --with-big-tables \
+ --enable-shared \
"
make
}
@@ -398,6 +401,7 @@ CXXFLAGS="$CXXFLAGS" \
BuildMySQL "\
--with-embedded-server \
--with-comment=\"MySQL Community Server (%{license})\"")
+
# We might want to save the config log file
if test -n "$MYSQL_CONFLOG_DEST"
then
@@ -867,6 +871,18 @@ fi
- Modify CFLAGS and CXXFLAGS such that a debug build is not optimized.
This should cover both gcc and icc flags. Fixes bug#40546.
+* Mon Nov 03 2008 Kent Boortz <kent.boortz@stripped>
+
+ - Added option --with-falcon
+ - Removed option --with-maria, enabled by default
+ - Use same way of defining what engines/plugins to use
+ - Remove some copy/paste between debug and normal build
+
+* Sat Nov 01 2008 Kent Boortz <kent.boortz@stripped>
+
+ - Removed "mysql_upgrade_shell"
+ - Enabled falcon storage engine for IA64
+
* Fri Aug 29 2008 Kent Boortz <kent@stripped>
- Removed the "Federated" storage engine option, and enabled in all
| Thread |
|---|
| • bzr push into mysql-6.0 branch (build:2794 to 2795) | MySQL Build Team | 4 Dec |
