bk commit into 6.0 tree (tsmith:1.2663)

[tim]

Below is the list of changes that have just been committed into a local
6.0 repository of tsmith.  When tsmith 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, 2008-05-10 12:00:21-06:00, tsmith@stripped +2 -0
  plug.in, Makefile.am:
    null merge; force conflict

  storage/innobase/Makefile.am@stripped, 2008-05-10 12:00:12-06:00, tsmith@stripped +1 -0
    null merge; force conflict

  storage/innobase/plug.in@stripped, 2008-05-10 12:00:11-06:00, tsmith@stripped +1 -0
    null merge; force conflict

diff -Nrup a/storage/innobase/Makefile.am b/storage/innobase/Makefile.am
--- a/storage/innobase/Makefile.am	2008-01-02 06:00:42 -07:00
+++ b/storage/innobase/Makefile.am	2008-05-10 12:00:12 -06:00
@@ -172,3 +172,4 @@ EXTRA_DIST =		CMakeLists.txt plug.in \
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%
+>>> NULL MERGE FORCE CONFLICT (will be removed during merge)
diff -Nrup a/storage/innobase/plug.in b/storage/innobase/plug.in
--- a/storage/innobase/plug.in	2007-07-25 02:33:42 -06:00
+++ b/storage/innobase/plug.in	2008-05-10 12:00:11 -06:00
@@ -37,3 +37,4 @@ MYSQL_PLUGIN_ACTIONS(innobase,  [
   esac
   ])
 
+>>> NULL MERGE FORCE CONFLICT (will be removed during merge)