MySQL Lists: commits: bk commit into 5.1 tree (mtaylor:1.2381)

List:	Commits	« Previous Message Next Message »
From:	Monty Taylor	Date:	January 11 2007 11:02am
Subject:	bk commit into 5.1 tree (mtaylor:1.2381)
View as plain text
Below is the list of changes that have just been committed into a local
5.1 repository of mtaylor. When mtaylor 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-01-11 02:02:41-08:00, mtaylor@qualinost.(none) +28 -0
  Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
  into  qualinost.(none):/home/mtaylor/src/mysql-5.1-maint
  MERGE: 1.1810.2362.40

  Makefile.am@stripped, 2007-01-11 01:59:38-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.68.1.25

  client/mysqlbinlog.cc@stripped, 2007-01-11 01:59:38-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.123.1.9

  client/mysqltest.c@stripped, 2007-01-11 01:59:39-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.155.9.80

  configure.in@stripped, 2007-01-11 02:02:24-08:00, mtaylor@qualinost.(none) +0 -6
    Too many differences. I'll merge by hand. 
    MERGE: 1.245.1.170

  include/config-win.h@stripped, 2007-01-11 01:59:39-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.71.1.12

  include/my_global.h@stripped, 2007-01-11 01:59:39-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.96.1.35

  include/my_pthread.h@stripped, 2007-01-11 01:59:39-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.90.1.5

  include/mysql.h@stripped, 2007-01-11 01:59:39-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.154.7.2

  include/typelib.h@stripped, 2007-01-11 01:59:39-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.4.1.1

  mysql-test/Makefile.am@stripped, 2007-01-11 01:59:39-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.66.1.16

  mysys/default.c@stripped, 2007-01-11 01:59:39-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.72.1.14

  mysys/my_wincond.c@stripped, 2007-01-11 01:59:39-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.8.1.1

  mysys/typelib.c@stripped, 2007-01-11 01:59:39-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.15.1.1

  server-tools/instance-manager/guardian.cc@stripped, 2007-01-11 01:59:39-08:00,
mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.20.1.7

  server-tools/instance-manager/instance.cc@stripped, 2007-01-11 01:59:39-08:00,
mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.32.1.5

  sql/field.cc@stripped, 2007-01-11 01:59:39-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.256.1.81

  sql/field.h@stripped, 2007-01-11 01:59:39-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.153.12.9

  sql/item_sum.cc@stripped, 2007-01-11 01:59:39-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.170.1.24

  sql/item_sum.h@stripped, 2007-01-11 01:59:39-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.102.1.7

  sql/net_serv.cc@stripped, 2007-01-11 01:59:39-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.88.1.7

  sql/opt_range.cc@stripped, 2007-01-11 01:59:41-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.159.1.77

  sql/share/charsets/hebrew.xml@stripped, 2007-01-11 01:59:41-08:00, mtaylor@qualinost.(none)
+0 -0
    Auto merged
    MERGE: 1.5.1.1

  sql/sql_class.h@stripped, 2007-01-11 01:59:41-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.230.1.87

  sql/sql_parse.cc@stripped, 2007-01-11 01:59:41-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.426.1.171

  sql/sql_show.cc@stripped, 2007-01-11 01:59:41-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.253.1.82

  storage/ndb/src/Makefile.am@stripped, 2007-01-11 01:59:41-08:00, mtaylor@qualinost.(none) +0
-0
    Auto merged
    MERGE: 1.13.2.2

  storage/ndb/src/Makefile.am@stripped, 2007-01-11 01:59:38-08:00,
mtaylor@qualinost.(none) +0 -0
    Merge rename: ndb/src/Makefile.am -> storage/ndb/src/Makefile.am

  strings/conf_to_src.c@stripped, 2007-01-11 01:59:41-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.19.1.1

  vio/viossl.c@stripped, 2007-01-11 01:59:41-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.34.2.6

# 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:	mtaylor
# Host:	qualinost.(none)
# Root:	/home/mtaylor/src/mysql-5.1-maint/RESYNC

--- 1.13.2.1/ndb/src/Makefile.am	2007-01-11 02:02:48 -08:00
+++ 1.17/storage/ndb/src/Makefile.am	2007-01-11 02:02:48 -08:00
@@ -1,6 +1,21 @@
+# Copyright (C) 2004-2005 MySQL AB
+# 
+# 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 SUBDIRS = common mgmapi ndbapi . kernel mgmclient mgmsrv cw
 
-include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/common.mk.am
 
 ndblib_LTLIBRARIES = libndbclient.la
 
@@ -22,14 +37,17 @@
 windoze-dsp: libndbclient.dsp
 
 libndbclient.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(ndblib_LTLIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ dummy.cpp
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(libndbclient_la_LIBADD)
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(ndblib_LTLIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ dummy.cpp
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(libndbclient_la_LIBADD)
 	@touch dummy.cpp
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
Thread
• bk commit into 5.1 tree (mtaylor:1.2381)	Monty Taylor	11 Jan