bk commit into 5.1 tree (serg:1.2186)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.1 repository of serg. When serg 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.2186 06/06/01 23:59:34 serg@stripped +2 -0
  second patch for make distcheck

  unittest/Makefile.am
    1.9 06/06/01 23:59:09 serg@stripped +2 -1
    second patch for make distcheck

  sql/ha_innodb.cc
    1.276 06/06/01 23:59:09 serg@stripped +4 -0
    second patch for make distcheck

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-5.1

--- 1.8/unittest/Makefile.am	Thu Jun  1 18:58:39 2006
+++ 1.9/unittest/Makefile.am	Thu Jun  1 23:59:09 2006
@@ -1,7 +1,8 @@
 SUBDIRS      = mytap . mysys examples
 
 noinst_SCRIPTS = unit
-EXTRA_DIST = 		unit.pl
+EXTRA_DIST = unit.pl
+CLEANFILES = unit
 
 unittests = mytap mysys
 

--- 1.275/sql/ha_innodb.cc	Sun May 28 14:50:53 2006
+++ 1.276/sql/ha_innodb.cc	Thu Jun  1 23:59:09 2006
@@ -42,6 +42,8 @@ have disables the InnoDB inlining in thi
 
 #define MAX_ULONG_BIT ((ulong) 1 << (sizeof(ulong)*8-1))
 
+#ifdef WITH_INNOBASE_STORAGE_ENGINE
+
 #include "ha_innodb.h"
 
 pthread_mutex_t innobase_share_mutex,	/* to protect innobase_open_files */
@@ -7459,4 +7461,6 @@ mysql_declare_plugin(innobase)
   0
 }
 mysql_declare_plugin_end;
+
+#endif