List:Commits« Previous MessageNext Message »
From:Patrick Galbraith Date:January 26 2006 5:57pm
Subject:bk commit into 5.1 tree (patg:1.2076)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of patg. When patg 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.2076 06/01/26 09:57:41 patg@stripped +1 -0
  Merge pgalbraith@stripped:/home/bk/mysql-5.1-new
  into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-wl2986

  sql/ha_partition.cc
    1.30 06/01/26 09:57:37 patg@stripped +0 -0
    Auto merged

# 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:	patg
# Host:	govinda.patg.net
# Root:	/home/patg/mysql-build/mysql-5.1-wl2986/RESYNC

--- 1.29/sql/ha_partition.cc	2006-01-25 22:08:29 -08:00
+++ 1.30/sql/ha_partition.cc	2006-01-26 09:57:37 -08:00
@@ -1779,7 +1779,7 @@
     return;                                     // Fatal error
   table->s->max_rows= part_elem->part_max_rows;
   table->s->min_rows= part_elem->part_min_rows;
-  char *partition_name= strrchr(partition_name_with_path, FN_LIBCHAR);
+  const char *partition_name= strrchr(partition_name_with_path, FN_LIBCHAR);
   if (part_elem->index_file_name)
     append_file_to_dir(current_thd,
                        (const char**)&part_elem->index_file_name,
Thread
bk commit into 5.1 tree (patg:1.2076)Patrick Galbraith26 Jan