List:Commits« Previous MessageNext Message »
From:tomas Date:January 12 2006 3:33pm
Subject:bk commit into 5.1 tree (tomas:1.2038)
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.2038 06/01/12 16:33:07 tomas@stripped +5 -0
  merge

  storage/ndb/tools/restore/restore_main.cpp
    1.38 06/01/12 16:32:59 tomas@stripped +1 -0
    merge

  storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp
    1.7 06/01/12 16:32:59 tomas@stripped +4 -0
    merge

  storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
    1.39 06/01/12 16:32:59 tomas@stripped +2 -2
    merge

  storage/ndb/include/ndbapi/ndb_cluster_connection.hpp
    1.15 06/01/12 16:32:59 tomas@stripped +0 -11
    merge

  mysql-test/t/disabled.def
    1.39 06/01/12 16:32:59 tomas@stripped +0 -1
    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-wl2325-v6

--- 1.38/mysql-test/t/disabled.def	2006-01-12 14:36:25 +01:00
+++ 1.39/mysql-test/t/disabled.def	2006-01-12 16:32:59 +01:00
@@ -29,4 +29,3 @@
 ndb_binlog_basic   : Results are not deterministic, Tomas will fix
 rpl_ndb_basic   : Bug#16228
 rpl_ndb_disk    : Not yet
-rpl_ndb_idempotent : TBF with cluster DD push, fails on slave insert of a row that does not exist

--- 1.37/storage/ndb/tools/restore/restore_main.cpp	2006-01-11 12:51:28 +01:00
+++ 1.38/storage/ndb/tools/restore/restore_main.cpp	2006-01-12 16:32:59 +01:00
@@ -76,6 +76,7 @@
   { "no-restore-disk-objects", 'd',
     "Dont restore disk objects (tablespace/logfilegroups etc)",
     (gptr*) &_no_restore_disk, (gptr*) &_no_restore_disk,  0,
+    GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
   { "restore_epoch", 'e', 
     "Restore epoch info into the status table. Convenient on a MySQL Cluster "
     "replication slave, for starting replication. The row in "

--- 1.14/storage/ndb/include/ndbapi/ndb_cluster_connection.hpp	2006-01-11 12:51:28 +01:00
+++ 1.15/storage/ndb/include/ndbapi/ndb_cluster_connection.hpp	2006-01-12 16:32:59 +01:00
@@ -44,17 +44,6 @@
  * for the connection to reach one or more storage nodes.
  */
 
-#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
-struct Ndb_cluster_connection_node_iter {
-  Ndb_cluster_connection_node_iter() : scan_state(~0),
-				       init_pos(0),
-				       cur_pos(0) {};
-  Uint8 scan_state;
-  Uint8 init_pos;
-  Uint8 cur_pos;
-};
-#endif
-
 class Ndb_cluster_connection {
 public:
   /**

--- 1.38/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp	2006-01-12 14:30:28 +01:00
+++ 1.39/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp	2006-01-12 16:32:59 +01:00
@@ -122,7 +122,7 @@
 }
 
 void
-Ndb_cluster_connection::init_get_next_node
+Ndb_cluster_connection_impl::init_get_next_node
 (Ndb_cluster_connection_node_iter &iter)
 {
   if (iter.scan_state != (Uint8)~0)
@@ -136,7 +136,7 @@
 }
 
 Uint32
-Ndb_cluster_connection::get_next_node(Ndb_cluster_connection_node_iter &iter)
+Ndb_cluster_connection_impl::get_next_node(Ndb_cluster_connection_node_iter &iter)
 {
   Uint32 cur_pos= iter.cur_pos;
   if (cur_pos >= no_db_nodes())

--- 1.6/storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp	2006-01-11 12:45:13 +01:00
+++ 1.7/storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp	2006-01-12 16:32:59 +01:00
@@ -36,6 +36,10 @@
   ~Ndb_cluster_connection_impl();
 
   void do_test();
+
+  void init_get_next_node(Ndb_cluster_connection_node_iter &iter);
+  Uint32 get_next_node(Ndb_cluster_connection_node_iter &iter);
+
 private:
   friend class Ndb;
   friend class NdbImpl;
Thread
bk commit into 5.1 tree (tomas:1.2038)tomas12 Jan