List:Commits« Previous MessageNext Message »
From:pkarthick Date:January 18 2006 9:43am
Subject:bk commit into 5.1 tree (pkarthick:1.2069)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of prem. When prem 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.2069 06/01/18 15:13:11 pkarthick@stripped +1 -0
  Added #ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION macro.

  sql/sql_class.cc
    1.237 06/01/18 15:13:06 pkarthick@stripped +2 -0
    Added #ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION macro.

# 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:	pkarthick
# Host:	blr-naas-nwl04.blr.novell.com
# Root:	/home/prem/bk/mysql-5.1

--- 1.236/sql/sql_class.cc	2006-01-17 18:02:22 +05:30
+++ 1.237/sql/sql_class.cc	2006-01-18 15:13:06 +05:30
@@ -2239,6 +2239,7 @@
   return pending;              /* This is the current pending event */
 }
 
+#ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
 /*
   Instansiate the versions we need, we have -fno-implicit-template as
   compiling option.
@@ -2257,6 +2258,7 @@
 THD::binlog_prepare_pending_rows_event(TABLE*, uint32, MY_BITMAP const*,
 				       my_size_t colcnt, my_size_t, bool,
 				       Update_rows_log_event *);
+#endif
 static char const* 
 field_type_name(enum_field_types type) 
 {
Thread
bk commit into 5.1 tree (pkarthick:1.2069)pkarthick18 Jan