List:Commits« Previous MessageNext Message »
From:Lars Thalmann Date:December 22 2005 4:05am
Subject:bk commit into 5.1 tree (lars:1.1980)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of lthalmann. When lthalmann 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.1980 05/12/22 05:05:07 lars@stripped +1 -0
  mysql-5.1-new did not compile

  sql/ha_partition.cc
    1.15 05/12/22 05:04:49 lars@stripped +2 -2
    mysql-5.1-new did not compile

# 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:	lars
# Host:	dl145h.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.1-wl1012-v3-max

--- 1.14/sql/ha_partition.cc	2005-12-21 19:24:56 +01:00
+++ 1.15/sql/ha_partition.cc	2005-12-22 05:04:49 +01:00
@@ -647,7 +647,7 @@
     if (!m_is_sub_partitioned)
     {
       name_buffer_ptr= strmov(name_buffer_ptr, part_elem->partition_name)+1;
-      *engine_array= (uchar) part_elem->engine_type;
+      *engine_array= (uchar) ha_legacy_type(part_elem->engine_type);
       DBUG_PRINT("info", ("engine: %u", *engine_array));
       engine_array++;
     }
@@ -660,7 +660,7 @@
 	name_buffer_ptr+= name_add(name_buffer_ptr,
 				    part_elem->partition_name,
 				    subpart_elem->partition_name);
-	*engine_array= (uchar) part_elem->engine_type;
+	*engine_array= (uchar) ha_legacy_type(part_elem->engine_type);
 	engine_array++;
       }
     }
Thread
bk commit into 5.1 tree (lars:1.1980)Lars Thalmann22 Dec