bk commit into 5.1 tree (jimw:1.1891) BUG#12590

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.1 repository of jimw. When jimw 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.1891 05/08/16 17:48:00 jimw@stripped +2 -0
  Fix compile error on HP-UX. (Bug #12590)

  sql/ha_ndbcluster.h
    1.92 05/08/16 17:47:56 jimw@stripped +1 -2
    Fix declaration of method

  sql/ha_innodb.h
    1.102 05/08/16 17:47:56 jimw@stripped +2 -2
    Fix declaration of method

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.1-12590

--- 1.91/sql/ha_ndbcluster.h	2005-08-05 14:50:35 -07:00
+++ 1.92/sql/ha_ndbcluster.h	2005-08-16 17:47:56 -07:00
@@ -584,8 +584,7 @@
                                      qc_engine_callback *engine_callback,
                                      ulonglong *engine_data);
 
-  bool ha_ndbcluster::check_if_incompatible_data(HA_CREATE_INFO *info,
-						 uint table_changes);
+  bool check_if_incompatible_data(HA_CREATE_INFO *info, uint table_changes);
 
 private:
   int alter_table_name(const char *to);

--- 1.101/sql/ha_innodb.h	2005-08-05 14:50:35 -07:00
+++ 1.102/sql/ha_innodb.h	2005-08-16 17:47:56 -07:00
@@ -202,8 +202,8 @@
         static ulonglong get_mysql_bin_log_pos();
         bool primary_key_is_clustered() { return true; }
         int cmp_ref(const byte *ref1, const byte *ref2);
-	bool ha_innobase::check_if_incompatible_data(HA_CREATE_INFO *info,
-						     uint table_changes);
+	bool check_if_incompatible_data(HA_CREATE_INFO *info,
+                                        uint table_changes);
 };
 
 extern struct show_var_st innodb_status_variables[];