List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:December 15 2005 5:00pm
Subject:bk commit into 5.1 tree (joerg:1.1977)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 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
  1.1977 05/12/15 18:00:08 joerg@stripped +3 -0
  Work in progress, not to be pushed: Revoke a change that broke release builds ("make dist").

  storage/innobase/include/Makefile.am
    1.1 05/12/15 18:00:02 joerg@stripped +60 -0

  storage/innobase/include/Makefile.am
    1.0 05/12/15 18:00:02 joerg@stripped +0 -0
    BitKeeper file /M51/try-5.1/storage/innobase/include/Makefile.am

  storage/innobase/configure.in
    1.34 05/12/15 18:00:02 joerg@stripped +1 -1
    Work in progress, not to be pushed: Revoke a change that broke release builds ("make dist").

  storage/innobase/Makefile.am
    1.9 05/12/15 18:00:02 joerg@stripped +1 -1
    Work in progress, not to be pushed: Revoke a change that broke release builds ("make dist").

# 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:	/M51/try-5.1
--- New file ---
+++ storage/innobase/include/Makefile.am	05/12/15 18:00:02
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
# & Innobase Oy
# 
# 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; either version 2 of the License, or
# (at your option) any later version.
# 
# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

noinst_HEADERS = btr0btr.h btr0btr.ic btr0cur.h btr0cur.ic \
        btr0pcur.h btr0pcur.ic btr0sea.h btr0sea.ic btr0types.h \
        buf0buf.h buf0buf.ic buf0flu.h buf0flu.ic buf0lru.h \
        buf0lru.ic buf0rea.h buf0types.h data0data.h data0data.ic data0type.h \
        data0type.ic data0types.h db0err.h dict0boot.h \
        dict0boot.ic dict0crea.h dict0crea.ic dict0dict.h \
        dict0dict.ic dict0load.h dict0load.ic dict0mem.h \
        dict0mem.ic dict0types.h dyn0dyn.h dyn0dyn.ic eval0eval.h \
        eval0eval.ic eval0proc.h eval0proc.ic fil0fil.h fsp0fsp.h \
        fsp0fsp.ic fut0fut.h fut0fut.ic fut0lst.h fut0lst.ic \
        ha0ha.h ha0ha.ic hash0hash.h hash0hash.ic \
        ibuf0ibuf.h ibuf0ibuf.ic ibuf0types.h lock0lock.h \
        lock0lock.ic lock0types.h log0log.h log0log.ic log0recv.h \
        log0recv.ic mach0data.h mach0data.ic \
        mem0dbg.h mem0dbg.ic mem0mem.h mem0mem.ic mem0pool.h \
        mem0pool.ic mtr0log.h mtr0log.ic mtr0mtr.h mtr0mtr.ic \
        mtr0types.h os0file.h os0proc.h os0proc.ic \
        os0sync.h os0sync.ic os0thread.h \
        os0thread.ic page0cur.h page0cur.ic page0page.h \
        page0page.ic page0types.h pars0grm.h pars0opt.h \
        pars0opt.ic pars0pars.h pars0pars.ic pars0sym.h \
        pars0sym.ic pars0types.h que0que.h que0que.ic que0types.h \
        read0read.h read0read.ic read0types.h rem0cmp.h \
        rem0cmp.ic rem0rec.h rem0rec.ic rem0types.h row0ins.h \
        row0ins.ic row0mysql.h row0mysql.ic row0purge.h \
        row0purge.ic row0row.h row0row.ic row0sel.h row0sel.ic \
        row0types.h row0uins.h row0uins.ic row0umod.h row0umod.ic \
        row0undo.h row0undo.ic row0upd.h row0upd.ic row0vers.h \
        row0vers.ic srv0que.h srv0srv.h srv0srv.ic srv0start.h \
        sync0arr.h sync0arr.ic sync0rw.h \
        sync0rw.ic sync0sync.h sync0sync.ic sync0types.h \
        thr0loc.h thr0loc.ic trx0purge.h trx0purge.ic trx0rec.h \
        trx0rec.ic trx0roll.h trx0roll.ic trx0rseg.h trx0rseg.ic \
        trx0sys.h trx0sys.ic trx0trx.h trx0trx.ic trx0types.h \
        trx0undo.h trx0undo.ic trx0xa.h univ.i \
        usr0sess.h usr0sess.ic usr0types.h ut0byte.h ut0byte.ic \
        ut0dbg.h ut0lst.h ut0mem.h ut0mem.ic ut0rnd.h ut0rnd.ic \
        ut0sort.h ut0ut.h ut0ut.ic

EXTRA_DIST = Makefile.i

# Don't update the files from bitkeeper
%::SCCS/s.%


--- 1.8/storage/innobase/Makefile.am	2005-12-13 14:48:59 +01:00
+++ 1.9/storage/innobase/Makefile.am	2005-12-15 18:00:02 +01:00
@@ -23,7 +23,7 @@
 noinst_HEADERS = ib_config.h
 
 SUBDIRS =		os ut btr buf data dict dyn eval fil fsp fut \
-			ha ibuf lock log mach mem mtr page \
+			ha ibuf include lock log mach mem mtr page \
 			pars que read rem row srv sync thr trx usr
 
 # Don't update the files from bitkeeper

--- 1.33/storage/innobase/configure.in	2005-12-13 14:49:00 +01:00
+++ 1.34/storage/innobase/configure.in	2005-12-15 18:00:02 +01:00
@@ -128,7 +128,7 @@
 		buf/Makefile data/Makefile dnl
 		dict/Makefile dyn/Makefile dnl
 		eval/Makefile fil/Makefile fsp/Makefile fut/Makefile dnl
-		ha/Makefile ibuf/Makefile dnl
+		ha/Makefile ibuf/Makefile include/Makefile dnl
 		lock/Makefile log/Makefile dnl
 		mach/Makefile mem/Makefile mtr/Makefile dnl
 		page/Makefile pars/Makefile que/Makefile dnl
Thread
bk commit into 5.1 tree (joerg:1.1977)Joerg Bruehe15 Dec