Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent 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-12-21 22:17:29+01:00, kent@stripped +3 -0
Merge mysql.com:/home/kent/bk/mysql-5.0-ltlibs
into mysql.com:/home/kent/bk/mysql-5.0-build
MERGE: 1.2344.3.1
configure.in@stripped, 2006-12-21 22:17:26+01:00, kent@stripped +0 -0
Auto merged
MERGE: 1.412.1.1
innobase/dict/dict0dict.c@stripped, 2006-12-21 22:17:27+01:00, kent@stripped +0 -0
Auto merged
MERGE: 1.76.1.1
innobase/log/log0recv.c@stripped, 2006-12-21 22:17:27+01:00, kent@stripped +0 -0
Auto merged
MERGE: 1.53.1.1
# 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: kent
# Host: kent-amd64.(none)
# Root: /home/kent/bk/mysql-5.0-build/RESYNC
--- 1.414/configure.in 2006-12-21 22:17:33 +01:00
+++ 1.415/configure.in 2006-12-21 22:17:33 +01:00
@@ -879,7 +879,7 @@
if test x"$have_libiberty" = xyes -a x"$have_libbfd" = xyes
then
pstack_dirs='$(top_srcdir)'/pstack
- pstack_libs="../pstack/libpstack.a -lbfd -liberty"
+ pstack_libs="../pstack/libpstack.la -lbfd -liberty"
# We must link staticly when using pstack
with_mysqld_ldflags="-all-static"
AC_SUBST([pstack_dirs])
@@ -2433,7 +2433,7 @@
readline_topdir="cmd-line-utils"
readline_basedir="libedit"
readline_dir="$readline_topdir/$readline_basedir"
- readline_link="\$(top_builddir)/cmd-line-utils/libedit/libedit.a"
+ readline_link="\$(top_builddir)/cmd-line-utils/libedit/libedit.la"
readline_h_ln_cmd="\$(LN) -s \$(top_srcdir)/cmd-line-utils/libedit/readline readline"
compile_libedit=yes
AC_DEFINE_UNQUOTED(HAVE_HIST_ENTRY, 1)
@@ -2443,7 +2443,7 @@
readline_topdir="cmd-line-utils"
readline_basedir="readline"
readline_dir="$readline_topdir/$readline_basedir"
- readline_link="\$(top_builddir)/cmd-line-utils/readline/libreadline.a"
+ readline_link="\$(top_builddir)/cmd-line-utils/readline/libreadline.la"
readline_h_ln_cmd="\$(LN) -s \$(top_srcdir)/cmd-line-utils/readline readline"
compile_readline=yes
AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE, 1)
@@ -2532,9 +2532,6 @@
then
AC_DEFINE([THREAD], [1],
[Define if you want to have threaded code. This may be undef on client code])
- # Avoid _PROGRAMS names
- THREAD_LOBJECTS="thr_alarm.o thr_lock.o thr_mutex.o thr_rwlock.o my_pthread.o my_thr_init.o mf_keycache.o"
- AC_SUBST(THREAD_LOBJECTS)
server_scripts="mysqld_safe mysql_install_db"
sql_server_dirs="strings mysys dbug extra regex"
@@ -2645,6 +2642,8 @@
#
sql_server_dirs="$sql_server_dirs myisam myisammrg heap vio sql"
fi
+
+AM_CONDITIONAL(HAVE_THREAD_SAFE_CLIENT, test "$with_server" = "yes" -o "$THREAD_SAFE_CLIENT" != "no")
# IMPORTANT - do not modify LIBS past this line - this hack is the only way
# I know to add the static NSS magic if we have static NSS libraries with
--- 1.77/innobase/dict/dict0dict.c 2006-12-21 22:17:33 +01:00
+++ 1.78/innobase/dict/dict0dict.c 2006-12-21 22:17:33 +01:00
@@ -708,13 +708,13 @@
mutex_create(&(dict_sys->mutex));
mutex_set_level(&(dict_sys->mutex), SYNC_DICT);
- dict_sys->table_hash = hash_create(buf_pool_get_max_size() /
+ dict_sys->table_hash = hash0_create(buf_pool_get_max_size() /
(DICT_POOL_PER_TABLE_HASH *
UNIV_WORD_SIZE));
- dict_sys->table_id_hash = hash_create(buf_pool_get_max_size() /
+ dict_sys->table_id_hash = hash0_create(buf_pool_get_max_size() /
(DICT_POOL_PER_TABLE_HASH *
UNIV_WORD_SIZE));
- dict_sys->col_hash = hash_create(buf_pool_get_max_size() /
+ dict_sys->col_hash = hash0_create(buf_pool_get_max_size() /
(DICT_POOL_PER_COL_HASH *
UNIV_WORD_SIZE));
dict_sys->size = 0;
--- 1.54/innobase/log/log0recv.c 2006-12-21 22:17:33 +01:00
+++ 1.55/innobase/log/log0recv.c 2006-12-21 22:17:33 +01:00
@@ -148,7 +148,7 @@
recv_sys->len = 0;
recv_sys->recovered_offset = 0;
- recv_sys->addr_hash = hash_create(available_memory / 64);
+ recv_sys->addr_hash = hash0_create(available_memory / 64);
recv_sys->n_addrs = 0;
recv_sys->apply_log_recs = FALSE;
@@ -187,7 +187,7 @@
hash_table_free(recv_sys->addr_hash);
mem_heap_empty(recv_sys->heap);
- recv_sys->addr_hash = hash_create(buf_pool_get_curr_size() / 256);
+ recv_sys->addr_hash = hash0_create(buf_pool_get_curr_size() / 256);
}
/************************************************************
| Thread |
|---|
| • bk commit into 5.0 tree (kent:1.2353) | kent | 21 Dec |
