bk commit into 5.1 tree (msvensson:1.2310) BUG#21855

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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, 2006-09-08 15:42:49+02:00, msvensson@shellback.(none) +1 -0
  Bug#21855 Compilation error in ha_innodb.cc
   - Add ifdefs in ha_innodb.cc so it's only compiled if we have selected to build mysqld with innodb.
     This is inline with how it's done in other handlers.

  sql/ha_innodb.cc@stripped, 2006-09-08 15:42:42+02:00, msvensson@shellback.(none) +3 -0
    Add ifdef for WITH_INNOBASE_STORAGE_ENGINE around all code in ha_innodb.cc so it's only included if we have defined --with-innodb to configure

# 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:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.1

--- 1.288/sql/ha_innodb.cc	2006-09-08 15:42:56 +02:00
+++ 1.289/sql/ha_innodb.cc	2006-09-08 15:42:56 +02:00
@@ -32,6 +32,8 @@
 #endif
 
 #include "mysql_priv.h"
+#ifdef WITH_INNOBASE_STORAGE_ENGINE
+
 #include "slave.h"
 
 #include <m_ctype.h>
@@ -7622,3 +7624,4 @@
 }
 mysql_declare_plugin_end;
 
+#endif