List:Commits« Previous MessageNext Message »
From:tomas Date:January 13 2006 12:01pm
Subject:bk commit into 5.1 tree (tomas:1.2052)
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.2052 06/01/13 13:01:19 tomas@stripped +2 -0
      enabled test
     added missing debug_return

  sql/ha_ndbcluster.cc
    1.234 06/01/13 13:01:11 tomas@stripped +4 -4
    added missing debug_return

  mysql-test/t/disabled.def
    1.40 06/01/13 13:01:11 tomas@stripped +0 -2
    enabled test

# 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-new

--- 1.39/mysql-test/t/disabled.def	2006-01-13 03:17:03 +01:00
+++ 1.40/mysql-test/t/disabled.def	2006-01-13 13:01:11 +01:00
@@ -21,8 +21,6 @@
 ps_7ndb         : dbug assert in RBR mode when executing test suite
 rpl_ddl         : Bug#15963 SBR does not show "Definer" correctly
 events          : Affects flush test case. A table lock not released somewhere
-ndb_autodiscover : TBF with CR
-ndb_autodiscover2 : TBF with CR
 ndb_binlog_basic   : Results are not deterministic, Tomas will fix
 rpl_ndb_basic   : Bug#16228
 rpl_sp          : Bug #16456

--- 1.233/sql/ha_ndbcluster.cc	2006-01-12 19:50:30 +01:00
+++ 1.234/sql/ha_ndbcluster.cc	2006-01-13 13:01:11 +01:00
@@ -6199,7 +6199,7 @@
       DBUG_PRINT("error", ("get_share: %s does not exist", key));
       if (!have_lock)
         pthread_mutex_unlock(&ndbcluster_mutex);
-      return 0;
+      DBUG_RETURN(0);
     }
     if ((share= (NDB_SHARE*) my_malloc(sizeof(*share),
                                        MYF(MY_WME | MY_ZEROFILL))))
@@ -6221,7 +6221,7 @@
         *root_ptr= old_root;
         if (!have_lock)
           pthread_mutex_unlock(&ndbcluster_mutex);
-        return 0;
+        DBUG_RETURN(0);
       }
       thr_lock_init(&share->lock);
       pthread_mutex_init(&share->mutex, MY_MUTEX_INIT_FAST);
@@ -6242,7 +6242,7 @@
       if (!have_lock)
         pthread_mutex_unlock(&ndbcluster_mutex);
       my_error(ER_OUTOFMEMORY, MYF(0), sizeof(*share));
-      return 0;
+      DBUG_RETURN(0);
     }
   }
   share->use_count++;
@@ -6258,7 +6258,7 @@
               share->use_count, share->commit_count));
   if (!have_lock)
     pthread_mutex_unlock(&ndbcluster_mutex);
-  return share;
+  DBUG_RETURN(share);
 }
 
 void ndbcluster_real_free_share(NDB_SHARE **share)
Thread
bk commit into 5.1 tree (tomas:1.2052)tomas13 Jan