List:Commits« Previous MessageNext Message »
From:knielsen Date:January 9 2006 10:08am
Subject:bk commit into 5.1 tree (knielsen:1.2025)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen 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.2025 06/01/09 11:08:23 knielsen@stripped +1 -0
  Fix template problem with Sun compiler by using anonymous namespace instead
  of static for referenged function.

  sql/handler.cc
    1.206 06/01/09 11:08:09 knielsen@stripped +12 -7
    Fix template problem with Sun compiler by using anonymous namespace instead
    of static for referenged function.

# 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:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/mysql-5.1-new-solaris-compile-fix

--- 1.205/sql/handler.cc	2006-01-07 14:49:39 +01:00
+++ 1.206/sql/handler.cc	2006-01-09 11:08:09 +01:00
@@ -2794,13 +2794,18 @@
 */
 
 #ifdef HAVE_ROW_BASED_REPLICATION
-static bool check_table_binlog_row_based(THD *thd, TABLE *table)
-{
-  return
-    binlog_row_based &&
-    thd && (thd->options & OPTION_BIN_LOG) &&
-    (table->s->tmp_table == NO_TMP_TABLE) &&
-    binlog_filter->db_ok(table->s->db.str);
+/* The Sun compiler cannot instantiate the template below if this is
+   declared static, but it works by putting it into an anonymous
+   namespace. */
+namespace {
+  bool check_table_binlog_row_based(THD *thd, TABLE *table)
+  {
+    return
+      binlog_row_based &&
+      thd && (thd->options & OPTION_BIN_LOG) &&
+      (table->s->tmp_table == NO_TMP_TABLE) &&
+      binlog_filter->db_ok(table->s->db.str);
+  }
 }
 
 template<class RowsEventT> int binlog_log_row(TABLE* table,
Thread
bk commit into 5.1 tree (knielsen:1.2025)knielsen9 Jan