List:Commits« Previous MessageNext Message »
From:Sergey Petrunia Date:January 5 2006 12:06am
Subject:bk commit into 5.1 tree (sergefp:1.2028)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of psergey. When psergey 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.2028 06/01/05 03:06:48 sergefp@stripped +1 -0
  WL#2985 "Partition pruning": Make compilable without partitioning engine.

  sql/sql_partition.cc
    1.21 06/01/05 03:06:09 sergefp@stripped +4 -3
    WL#2985 "Partition pruning": Make compilable without partitioning engine.

# 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:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-5.1-ppruning-r4-compiled-out

--- 1.20/sql/sql_partition.cc	2006-01-04 11:08:49 +03:00
+++ 1.21/sql/sql_partition.cc	2006-01-05 03:06:09 +03:00
@@ -3481,7 +3481,7 @@
   DBUG_VOID_RETURN;
 }
 
-
+#ifdef WITH_PARTITION_STORAGE_ENGINE
 /*
   Return comma-separated list of used partitions in the provided given string
 
@@ -3544,7 +3544,7 @@
     }
   }
 }
-
+#endif
 
 /****************************************************************************
  * Partition interval analysis support
@@ -3582,7 +3582,7 @@
     this criteria, and also sets some auxilary fields that the function
     uses.
 */
-
+#ifdef WITH_PARTITION_STORAGE_ENGINE
 static void set_up_range_analysis_info(partition_info *part_info)
 {
   enum_monotonicity_info minfo;
@@ -3978,4 +3978,5 @@
   part_iter->start_val++;
   return part_iter->part_info->get_subpartition_id(part_iter->part_info);
 }
+#endif
 
Thread
bk commit into 5.1 tree (sergefp:1.2028)Sergey Petrunia5 Jan