fixes to make the code compile with gcc 2.95 (3d203da0) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -1616,3 +1616,4 @@ zlib/*.ds?
		zlib/*.vcproj
		libmysqld/partition_info.cc
		storage/ndb/src/common/util/testBitmask.cpp
		include/openssl

sql/partition_element.h

+1 −5

Original line number	Diff line number	Diff line
		@@ -14,10 +14,6 @@
		along with this program; if not, write to the Free Software
		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.
		*/

sql/partition_info.cc

+4 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,10 @@

		/* Some general useful functions */

		#ifdef USE_PRAGMA_IMPLEMENTATION
		#pragma implementation
		#endif

		#include "mysql_priv.h"
		#include "ha_partition.h"

sql/partition_info.h

+17 −41

Original line number	Diff line number	Diff line
		@@ -224,8 +224,18 @@ class partition_info : public Sql_alloc
		}
		~partition_info() {}

		bool is_sub_partitioned();
		uint get_tot_partitions();
		/* Answers the question if subpartitioning is used for a certain table */
		bool is_sub_partitioned()
		{
		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);
		char *has_unique_names();
		@@ -238,40 +248,6 @@ class partition_info : public Sql_alloc
		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);

		/* Initialize the iterator to return a single partition with given part_id */