From: Date: February 28 2006 11:00am
Subject: bk commit into 5.1 tree (msvensson:1.2191)
List-Archive: http://lists.mysql.com/commits/3229
Message-Id: <20060228100059.D8185860036@localhost.localdomain>

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
  1.2191 06/02/28 11:00:47 msvensson@shellback.(none) +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into  shellback.(none):/home/msvensson/mysql/mysql-5.1

  sql/handler.h
    1.197 06/02/28 11:00:35 msvensson@shellback.(none) +0 -0
    Auto merged

# 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/RESYNC

--- 1.196/sql/handler.h	2006-02-26 14:12:50 +01:00
+++ 1.197/sql/handler.h	2006-02-28 11:00:35 +01:00
@@ -672,11 +672,15 @@
 
 typedef struct system_status_var SSV;
 
+/*
+  The handler class is the interface for dynamically loadable
+  storage engines. Do not add ifdefs and take care when adding or
+  changing virtual functions to avoid vtable confusion
+ */
 class handler :public Sql_alloc
 {
-#ifdef WITH_PARTITION_STORAGE_ENGINE
- friend class ha_partition;
-#endif
+  friend class ha_partition;
+
  protected:
   struct st_table_share *table_share;   /* The table definition */
   struct st_table *table;               /* The current open table */
@@ -1254,7 +1258,7 @@
   virtual const char *table_type() const =0;
   virtual const char **bas_ext() const =0;
   virtual ulong table_flags(void) const =0;
-#ifdef WITH_PARTITION_STORAGE_ENGINE
+
   virtual int get_default_no_partitions(ulonglong max_rows) { return 1;}
   virtual void set_auto_partitions(partition_info *part_info) { return; }
   virtual bool get_no_parts(const char *name,
@@ -1264,7 +1268,7 @@
     return 0;
   }
   virtual void set_part_info(partition_info *part_info) {return;}
-#endif
+
   virtual ulong index_flags(uint idx, uint part, bool all_parts) const =0;
 
   virtual int add_index(TABLE *table_arg, KEY *key_info, uint num_of_keys)