MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:tomas Date:August 17 2005 10:40am
Subject:bk commit into 5.1 tree (tomas:1.1879)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.1879 05/08/17 12:40:30 tomas@stripped +3 -0
  merge

  sql/sql_class.cc
    1.198 05/08/17 12:40:24 tomas@stripped +0 -1
    merge

  sql/mysqld.cc
    1.474 05/08/17 12:40:24 tomas@stripped +9 -31
    merge

  sql/handler.h
    1.155 05/08/17 12:40:24 tomas@stripped +2 -2
    merge

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl1012

--- 1.154/sql/handler.h	2005-08-17 10:39:10 +02:00
+++ 1.155/sql/handler.h	2005-08-17 12:40:24 +02:00
@@ -747,7 +747,7 @@
   MY_BITMAP *read_set;
   MY_BITMAP *write_set;
 
-  handler(const handlerton *ht_arg, TABLE *table_arg, ulong rplf= 0UL) 
+  handler(const handlerton *ht_arg, TABLE *table_arg) 
    :table(table_arg), ht(ht_arg),
     ref(0), data_file_length(0), max_data_file_length(0), index_file_length(0),
     delete_length(0), auto_increment_value(0),
@@ -756,7 +756,7 @@
     key_used_on_scan(MAX_KEY), active_index(MAX_KEY),
     ref_length(sizeof(my_off_t)), block_size(0),
     raid_type(0), ft_handler(0), inited(NONE), implicit_emptied(0),
-    pushed_cond(NULL), repl_flags(rplf)
+    pushed_cond(NULL)
     {}
   virtual ~handler(void)
   {

--- 1.473/sql/mysqld.cc	2005-08-17 10:44:52 +02:00
+++ 1.474/sql/mysqld.cc	2005-08-17 12:40:24 +02:00
@@ -2884,11 +2884,15 @@
   }
   if (opt_binlog_format_id == BF_UNSPECIFIED)
   {
-    /*
-      We use statement-based by default, but could change this to be row-based
-      if this is a cluster build (i.e. have_ndbcluster is true)...
-    */
-    opt_binlog_format_id= BF_STMT;
+#ifdef HAVE_ROW_BASED_REPLICATION
+    if (have_ndbcluster == SHOW_OPTION_YES)
+    {
+      rpl_filter->add_ignore_table("cluster_replication.binlog_index");
+      opt_binlog_format_id= BF_ROW;
+    }
+    else
+#endif
+      opt_binlog_format_id= BF_STMT;
   }
 #ifdef HAVE_ROW_BASED_REPLICATION
   if (opt_binlog_format_id == BF_ROW) 
@@ -7038,32 +7042,6 @@
 				  &global_system_variables.datetime_format))
     exit(1);
 
-  if (opt_bin_log)
-  {
-    if (opt_binlog_format_id == BF_NONE)
-    {
-      if (have_ndbcluster == SHOW_OPTION_YES)
-      {
-	rpl_filter->add_ignore_table("cluster_replication.binlog_index");
-	opt_binlog_format_id= BF_ROW;
-      }
-      else
-	opt_binlog_format_id= BF_STMT;
-    }
-    if (opt_binlog_format_id == BF_ROW) 
-    {
-      opt_binlog_row_based_logging= TRUE;
-      /* Row-based logging turns on InnoDB unsafe locking: the locks
-       * are not needed when using row-based. */
-#ifdef HAVE_INNOBASE_DB
-      innobase_locks_unsafe_for_binlog= TRUE;
-#endif
-    }
-  }
-  else
-    opt_binlog_format_id= BF_NONE;
-
-  opt_binlog_format= binlog_format_names[opt_binlog_format_id];
 }
 
 

--- 1.197/sql/sql_class.cc	2005-08-17 10:50:14 +02:00
+++ 1.198/sql/sql_class.cc	2005-08-17 12:40:24 +02:00
@@ -2300,4 +2300,3 @@
 
 #endif /* !defined(MYSQL_CLIENT) */
 #endif /* HAVE_ROW_BASED_REPLICATION */
->>>>>>>
Thread
bk commit into 5.1 tree (tomas:1.1879)tomas17 Aug