List:Commits« Previous MessageNext Message »
From:Sergei Golubchik Date:January 26 2006 7:57pm
Subject:bk commit into 5.1 tree (serg:1.2083)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of serg. When serg 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.2083 06/01/26 20:56:56 serg@stripped +2 -0
  gcc295 fixes for embedded

  sql/handler.h
    1.182 06/01/26 20:56:42 serg@stripped +11 -16
    gcc295 fixes for embedded

  libmysqld/lib_sql.cc
    1.110 06/01/26 20:56:42 serg@stripped +3 -0
    gcc295 fixes for embedded

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-5.1

--- 1.181/sql/handler.h	Wed Jan 25 04:01:48 2006
+++ 1.182/sql/handler.h	Thu Jan 26 20:56:42 2006
@@ -800,14 +800,6 @@ typedef int (*get_partitions_in_range_it
                                             PARTITION_ITERATOR *part_iter);
 
 
-/* Initialize the iterator to return a single partition with given part_id */
-inline void init_single_partition_iterator(uint32 part_id,
-                                           PARTITION_ITERATOR *part_iter);
-
-/* Initialize the iterator to enumerate all partitions */
-inline void init_all_partitions_iterator(partition_info *part_info,
-                                         PARTITION_ITERATOR *part_iter);
-
 class partition_info : public Sql_alloc
 {
 public:
@@ -1007,7 +999,9 @@ public:
 #ifdef WITH_PARTITION_STORAGE_ENGINE
 uint32 get_next_partition_id_range(struct st_partition_iter* part_iter);
 
-inline void init_single_partition_iterator(uint32 part_id,
+/* Initialize the iterator to return a single partition with given part_id */
+
+static inline void init_single_partition_iterator(uint32 part_id,
                                            PARTITION_ITERATOR *part_iter)
 {
   part_iter->part_nums.start= part_id;
@@ -1015,7 +1009,8 @@ inline void init_single_partition_iterat
   part_iter->get_next= get_next_partition_id_range;
 }
 
-inline 
+/* Initialize the iterator to enumerate all partitions */
+static inline
 void init_all_partitions_iterator(partition_info *part_info,
                                   PARTITION_ITERATOR *part_iter)
 {
@@ -1034,7 +1029,7 @@ void init_all_partitions_iterator(partit
   DESCRIPTION
     A routine to check for subpartitioning for improved readability of code
 */
-inline
+static inline
 bool is_sub_partitioned(partition_info *part_info)
 { return (part_info->subpart_type == NOT_A_PARTITION ?  FALSE : TRUE); }
 
@@ -1050,7 +1045,7 @@ bool is_sub_partitioned(partition_info *
     A routine to check for number of partitions for improved readability
     of code
 */
-inline
+static inline
 uint get_tot_partitions(partition_info *part_info)
 {
   return part_info->no_parts *
@@ -1924,22 +1919,22 @@ handlerton *ha_checktype(THD *thd, enum 
                           bool no_substitute, bool report_error);
 
 
-inline enum legacy_db_type ha_legacy_type(const handlerton *db_type)
+static inline enum legacy_db_type ha_legacy_type(const handlerton *db_type)
 {
   return (db_type == NULL) ? DB_TYPE_UNKNOWN : db_type->db_type;
 }
 
-inline const char *ha_resolve_storage_engine_name(const handlerton *db_type)
+static inline const char *ha_resolve_storage_engine_name(const handlerton *db_type)
 {
   return db_type == NULL ? "UNKNOWN" : db_type->name;
 }
 
-inline bool ha_check_storage_engine_flag(const handlerton *db_type, uint32 flag)
+static inline bool ha_check_storage_engine_flag(const handlerton *db_type, uint32 flag)
 {
   return db_type == NULL ? FALSE : test(db_type->flags & flag);
 }
 
-inline bool ha_storage_engine_is_enabled(const handlerton *db_type)
+static inline bool ha_storage_engine_is_enabled(const handlerton *db_type)
 {
   return (db_type && db_type->create) ?
          (db_type->state == SHOW_OPTION_YES) : FALSE;

--- 1.109/libmysqld/lib_sql.cc	Mon Jan 23 08:58:08 2006
+++ 1.110/libmysqld/lib_sql.cc	Thu Jan 26 20:56:42 2006
@@ -46,6 +46,8 @@ C_MODE_START
 
 static my_bool emb_read_query_result(MYSQL *mysql);
 
+C_MODE_END
+
 void THD::clear_data_list()
 {
   while (first_data)
@@ -59,6 +61,7 @@ void THD::clear_data_list()
   cur_data= 0;
 }
 
+C_MODE_START
 
 /*
   Reads error information from the MYSQL_DATA and puts
Thread
bk commit into 5.1 tree (serg:1.2083)Sergei Golubchik26 Jan