Commit 3d203da0 authored by unknown's avatar unknown

fixes to make the code compile with gcc 2.95


BitKeeper/etc/ignore:
  Added include/openssl to the ignore list
parent 594ba86b
...@@ -1616,3 +1616,4 @@ zlib/*.ds? ...@@ -1616,3 +1616,4 @@ zlib/*.ds?
zlib/*.vcproj zlib/*.vcproj
libmysqld/partition_info.cc libmysqld/partition_info.cc
storage/ndb/src/common/util/testBitmask.cpp storage/ndb/src/common/util/testBitmask.cpp
include/openssl
...@@ -13,10 +13,6 @@ ...@@ -13,10 +13,6 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
#endif
/** /**
* An enum and a struct to handle partitioning and subpartitioning. * An enum and a struct to handle partitioning and subpartitioning.
...@@ -55,7 +51,7 @@ class partition_element :public Sql_alloc { ...@@ -55,7 +51,7 @@ class partition_element :public Sql_alloc {
handlerton *engine_type; handlerton *engine_type;
enum partition_state part_state; enum partition_state part_state;
uint16 nodegroup_id; uint16 nodegroup_id;
partition_element() partition_element()
: part_max_rows(0), part_min_rows(0), partition_name(NULL), : part_max_rows(0), part_min_rows(0), partition_name(NULL),
tablespace_name(NULL), range_value(0), part_comment(NULL), tablespace_name(NULL), range_value(0), part_comment(NULL),
......
...@@ -16,6 +16,10 @@ ...@@ -16,6 +16,10 @@
/* Some general useful functions */ /* Some general useful functions */
#ifdef USE_PRAGMA_IMPLEMENTATION
#pragma implementation
#endif
#include "mysql_priv.h" #include "mysql_priv.h"
#include "ha_partition.h" #include "ha_partition.h"
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef USE_PRAGMA_INTERFACE #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
...@@ -223,55 +223,31 @@ class partition_info : public Sql_alloc ...@@ -223,55 +223,31 @@ class partition_info : public Sql_alloc
subpart_field_list.empty(); subpart_field_list.empty();
} }
~partition_info() {} ~partition_info() {}
bool is_sub_partitioned(); /* Answers the question if subpartitioning is used for a certain table */
uint get_tot_partitions(); bool is_sub_partitioned()
bool set_up_defaults_for_partitioning(handler *file, ulonglong max_rows, {
return (subpart_type == NOT_A_PARTITION ? FALSE : TRUE);
}
/* Returns the total number of partitions on the leaf level */
uint get_tot_partitions()
{
return no_parts * (is_sub_partitioned() ? no_subparts : 1);
}
bool set_up_defaults_for_partitioning(handler *file, ulonglong max_rows,
uint start_no); uint start_no);
char *has_unique_names(); char *has_unique_names();
private: private:
bool set_up_default_partitions(handler *file, ulonglong max_rows, bool set_up_default_partitions(handler *file, ulonglong max_rows,
uint start_no); uint start_no);
bool set_up_default_subpartitions(handler *file, ulonglong max_rows); bool set_up_default_subpartitions(handler *file, ulonglong max_rows);
char *create_default_partition_names(uint part_no, uint no_parts, char *create_default_partition_names(uint part_no, uint no_parts,
uint start_no, bool is_subpart); uint start_no, bool is_subpart);
bool has_unique_name(partition_element *element); bool has_unique_name(partition_element *element);
}; };
/*
Answers the question if subpartitioning is used for a certain table
SYNOPSIS
is_sub_partitioned()
part_info A reference to the partition_info struct
RETURN VALUE
Returns true if subpartitioning used and false otherwise
DESCRIPTION
A routine to check for subpartitioning for improved readability of code
*/
inline
bool partition_info::is_sub_partitioned()
{
return (subpart_type == NOT_A_PARTITION ? FALSE : TRUE);
}
/*
Returns the total number of partitions on the leaf level.
SYNOPSIS
get_tot_partitions()
part_info A reference to the partition_info struct
RETURN VALUE
Returns the number of partitions
DESCRIPTION
A routine to check for number of partitions for improved readability
of code
*/
inline
uint partition_info::get_tot_partitions()
{
return no_parts * (is_sub_partitioned() ? no_subparts : 1);
}
uint32 get_next_partition_id_range(struct st_partition_iter* part_iter); uint32 get_next_partition_id_range(struct st_partition_iter* part_iter);
/* Initialize the iterator to return a single partition with given part_id */ /* Initialize the iterator to return a single partition with given part_id */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment