[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mysql-internals
Subject:    bk commit into 5.1-ndb tree (joreland:1.1665)
From:       jonas.oreland () mysql ! com
Date:       2004-11-30 14:14:08
Message-ID: 200411301414.iAUEE8Kf032502 () eel ! ndb ! mysql ! com
[Download RAW message or body]

Below is the list of changes that have just been committed into a local
5.1-ndb repository of jonas. When jonas 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1665 04/11/30 15:14:05 joreland@mysql.com +4 -0
  ndb merge 5.0-ndb -> 5.1-ndb

  sql/ha_ndbcluster.h
    1.46 04/11/30 15:14:02 joreland@mysql.com +2 -0
    temp remove read_multi_range

  sql/ha_ndbcluster.cc
    1.89 04/11/30 15:14:02 joreland@mysql.com +2 -0
    temp remove read_multi_range

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.43 04/11/30 15:14:02 joreland@mysql.com +0 -2
    merge error

  mysql-test/t/ndb_autodiscover.test
    1.10 04/11/30 15:14:02 joreland@mysql.com +1 -1
    fix drop table

# 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:	joreland
# Host:	eel.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1-ndb

--- 1.9/mysql-test/t/ndb_autodiscover.test	Wed Nov 24 12:43:04 2004
+++ 1.10/mysql-test/t/ndb_autodiscover.test	Tue Nov 30 15:14:02 2004
@@ -479,4 +479,4 @@
 
 insert into t10 values (1, 'kalle');
 
---exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test \
`$NDB_TOOLS_DIR/ndb_show_tables --no-defaults | grep BLOB` > /dev/null 2>&1 || true \
+--exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test \
`$NDB_TOOLS_DIR/ndb_show_tables --no-defaults | grep BLOB | while read a b c d e f g; \
do echo $g; done` > /dev/null 2>&1 || true

--- 1.42/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	Mon Nov 29 09:32:27 2004
+++ 1.43/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	Tue Nov 30 15:14:02 2004
@@ -8350,7 +8350,6 @@
     scanptr.p->scanCompletedStatus != ZTRUE)
   {
     jam();
-    releaseActiveFrag(signal);
     continueAfterReceivingAllAiLab(signal);
     return;
   }
@@ -9170,7 +9169,6 @@
   scanptr.i = tcConnectptr.p->tcScanRec;
   c_scanRecordPool.getPtr(scanptr);
   ScanRecord* scanP = scanptr.p;
-  releaseActiveFrag(signal);
   if (tcConnectptr.p->errorCode != 0) {
     jam();
     closeCopyLab(signal);

--- 1.88/sql/ha_ndbcluster.cc	Tue Nov 30 14:22:13 2004
+++ 1.89/sql/ha_ndbcluster.cc	Tue Nov 30 15:14:02 2004
@@ -4732,6 +4732,7 @@
   DBUG_RETURN(error);
 }
 
+#if 0
 int
 ha_ndbcluster::read_multi_range_first(key_multi_range **found_range_p,
 				      key_multi_range *ranges, 
@@ -4911,5 +4912,6 @@
 				     multi_range_sorted,
 				     multi_range_buffer));
 }
+#endif
 
 #endif /* HAVE_NDBCLUSTER_DB */

--- 1.45/sql/ha_ndbcluster.h	Mon Nov 29 09:32:28 2004
+++ 1.46/sql/ha_ndbcluster.h	Tue Nov 30 15:14:02 2004
@@ -114,10 +114,12 @@
   /**
    * Multi range stuff
    */
+#if 0
   int read_multi_range_first(key_multi_range **found_range_p,
 			     key_multi_range *ranges, uint range_count,
 			     bool sorted, handler_buffer *buffer);
   int read_multi_range_next(void);
+#endif
 
   bool get_error_message(int error, String *buf);
   void info(uint);

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    http://lists.mysql.com/internals?unsub=mysql-internals@progressive-comp.com



[prev in list] [next in list] [prev in thread] [next in thread]