List:Commits« Previous MessageNext Message »
From:jonas Date:January 3 2006 8:15pm
Subject:bk commit into 5.1 tree (jonas:1.1985) BUG#16160
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1985 06/01/03 21:15:23 jonas@eel.(none) +1 -0
  bug#16160 - ndb dd
    Make sure ndb object get seized to thd before performing alter tablespace/logfile group

  sql/ha_ndbcluster.cc
    1.220 06/01/03 21:15:18 jonas@eel.(none) +8 -6
    Make sure ndb object get seized to thd before performing alter tablespace/logfile group

# 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:	jonas
# Host:	eel.(none)
# Root:	/home/jonas/src/51-dd

--- 1.219/sql/ha_ndbcluster.cc	2005-12-29 08:19:36 +01:00
+++ 1.220/sql/ha_ndbcluster.cc	2006-01-03 21:15:18 +01:00
@@ -8331,14 +8331,16 @@
 
 int ndbcluster_alter_tablespace(THD* thd, st_alter_tablespace *info)
 {
-  Thd_ndb *thd_ndb= get_thd_ndb(thd);
-  Ndb *ndb= thd_ndb->ndb;
-  NDBDICT *dict;
-  int error;
-
   DBUG_ENTER("ha_ndbcluster::alter_tablespace");
 
-  dict= ndb->getDictionary();
+  Ndb *ndb= check_ndb_in_thd(thd);
+  if (ndb == NULL)
+  {
+    DBUG_RETURN(HA_ERR_NO_CONNECTION);
+  }
+  
+  NDBDICT *dict = ndb->getDictionary();
+  int error;
 
   switch (info->ts_cmd_type){
   case (CREATE_TABLESPACE):
Thread
bk commit into 5.1 tree (jonas:1.1985) BUG#16160jonas3 Jan