Below is the list of changes that have just been committed into a local
5.0 repository of joerg. When joerg 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, 2007-06-13 13:55:42+02:00, joerg@trift2. +31 -0
Merge trift2.:/MySQL/M41/tmp-4.1
into trift2.:/MySQL/M50/merge-5.0
MERGE: 1.1616.2877.108
configure.in@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.201.64.28
libmysqld/lib_sql.cc@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.75.1.65
netware/comp_err.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.2.1.1
netware/isamchk.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.5.1.1
netware/isamlog.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.4.1.1
netware/libmysql.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.4.1.2
netware/my_print_defaults.def@stripped, 2007-06-13 13:50:54+02:00, joerg@trift2. +0 -1
5.0 already has 128 kB stack size.
MERGE: 1.4.1.2
netware/myisam_ftdump.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.2.1.1
netware/myisamchk.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.5.1.2
netware/myisamlog.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.5.1.2
netware/myisampack.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.5.1.2
netware/mysql.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.4.1.3
netware/mysql_install_db.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.4.1.2
netware/mysql_test_run.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.4.1.1
netware/mysql_waitpid.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.2.1.1
netware/mysqladmin.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.4.1.3
netware/mysqlbinlog.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.5.1.3
netware/mysqlcheck.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.5.1.3
netware/mysqld.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.3.1.1
netware/mysqld_safe.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.3.1.2
netware/mysqldump.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.5.1.3
netware/mysqlimport.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.5.1.3
netware/mysqlshow.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.4.1.2
netware/mysqltest.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.4.1.1
netware/pack_isam.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.4.1.2
netware/perror.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.4.1.2
netware/replace.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.4.1.1
netware/resolve_stack_dump.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.2.1.1
netware/resolveip.def@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -1
Auto merged
MERGE: 1.4.1.1
sql/Makefile.am@stripped, 2007-06-13 13:55:38+02:00, joerg@trift2. +1 -3
Manual merge.
MERGE: 1.77.1.42
sql/item_func.cc@stripped, 2007-06-13 13:48:49+02:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.124.42.25
# 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: joerg
# Host: trift2.
# Root: /MySQL/M50/merge-5.0/RESYNC
--- 1.444/configure.in 2007-05-24 09:21:57 +02:00
+++ 1.445/configure.in 2007-06-13 13:48:49 +02:00
@@ -1736,6 +1736,12 @@
[CLIENT_EXTRA_LDFLAGS=])
AC_SUBST(CLIENT_EXTRA_LDFLAGS)
+AC_ARG_WITH(mysqld-libs,
+ [ --with-mysqld-libs Extra libraries to link with for mysqld],
+ [MYSQLD_EXTRA_LIBS=$withval],
+ [MYSQLD_EXTRA_LIBS=])
+AC_SUBST(MYSQLD_EXTRA_LIBS)
+
AC_ARG_WITH(lib-ccflags,
[ --with-lib-ccflags Extra CC options for libraries],
[LIB_EXTRA_CCFLAGS=$withval],
--- 1.133/sql/Makefile.am 2007-04-23 11:25:30 +02:00
+++ 1.134/sql/Makefile.am 2007-06-13 13:55:38 +02:00
@@ -43,7 +43,7 @@
@innodb_system_libs@ \
@ndbcluster_libs@ @ndbcluster_system_libs@ \
$(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
- $(yassl_libs) $(openssl_libs)
+ $(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@
noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
item_strfunc.h item_timefunc.h item_uniq.h \
--- 1.347/sql/item_func.cc 2007-06-03 13:21:53 +02:00
+++ 1.348/sql/item_func.cc 2007-06-13 13:48:49 +02:00
@@ -3578,7 +3578,7 @@
else
{
#ifdef EMBEDDED_LIBRARY
- if (ull->locked && pthread_equal(current_thd->real_id,ull->thread))
+ if (ull->locked && (current_thd->real_id == ull->thread))
#else
if (ull->locked && pthread_equal(pthread_self(),ull->thread))
#endif
--- 1.128/libmysqld/lib_sql.cc 2007-03-22 09:01:38 +01:00
+++ 1.129/libmysqld/lib_sql.cc 2007-06-13 13:48:49 +02:00
@@ -590,7 +590,7 @@
thd->set_time();
thd->init_for_queries();
thd->client_capabilities= client_flag;
- thd->real_id= (pthread_t) thd;
+ thd->real_id= (pthread_t)thd->thread_id;
thd->db= NULL;
thd->db_length= 0;
| Thread |
|---|
| • bk commit into 5.0 tree (joerg:1.2514) | Joerg Bruehe | 13 Jun |
