1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint

Browse Source 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
This commit is contained in:
tomas@whalegate.ndb.mysql.com 2007-03-22 10:34:46 +01:00
commit 8b964c2b12
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ndb/src/mgmsrv/MgmtSrvr.cpp
View File

@ -2494,6 +2494,8 @@ MgmtSrvr::startBackup(Uint32& backupId, int waitCompleted)
ndbout_c("I'm not master resending to %d", nodeId); ndbout_c("I'm not master resending to %d", nodeId);
#endif #endif
do_send = 1; // try again do_send = 1; // try again
if (!theFacade->get_node_alive(nodeId))
m_master_node = nodeId = 0;
continue; continue;
} }
event.Event = BackupEvent::BackupFailedToStart; event.Event = BackupEvent::BackupFailedToStart;

9
sql/ha_ndbcluster.cc
View File

@ -952,7 +952,7 @@ int ha_ndbcluster::get_metadata(const char *path)
DBUG_PRINT("enter", ("m_tabname: %s, path: %s", m_tabname, path)); DBUG_PRINT("enter", ("m_tabname: %s, path: %s", m_tabname, path));
do { do {
const void *data, *pack_data; const void *data= NULL, *pack_data= NULL;
uint length, pack_length; uint length, pack_length;
if (!(tab= dict->getTable(m_tabname))) if (!(tab= dict->getTable(m_tabname)))
@ -3751,7 +3751,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
if ((my_errno= build_index_list(ndb, table, ILBP_OPEN))) if ((my_errno= build_index_list(ndb, table, ILBP_OPEN)))
DBUG_RETURN(my_errno); DBUG_RETURN(my_errno);
const void *data, *pack_data; const void *data= NULL, *pack_data= NULL;
uint length, pack_length; uint length, pack_length;
if (readfrm(table->s->path, &data, &length) || if (readfrm(table->s->path, &data, &length) ||
packfrm(data, length, &pack_data, &pack_length) || packfrm(data, length, &pack_data, &pack_length) ||
@ -4340,7 +4340,7 @@ int ha_ndbcluster::create(const char *name,
NDBTAB tab; NDBTAB tab;
NDBCOL col; NDBCOL col;
uint pack_length, length, i, pk_length= 0; uint pack_length, length, i, pk_length= 0;
const void *data, *pack_data; const void *data= NULL, *pack_data= NULL;
char name2[FN_HEADLEN]; char name2[FN_HEADLEN];
bool create_from_engine= (create_info->table_options & HA_OPTION_CREATE_FROM_ENGINE); bool create_from_engine= (create_info->table_options & HA_OPTION_CREATE_FROM_ENGINE);
@ -4375,7 +4375,10 @@ int ha_ndbcluster::create(const char *name,
if (readfrm(name, &data, &length)) if (readfrm(name, &data, &length))
DBUG_RETURN(1); DBUG_RETURN(1);
if (packfrm(data, length, &pack_data, &pack_length)) if (packfrm(data, length, &pack_data, &pack_length))
{
my_free((char*)data, MYF(0));
DBUG_RETURN(2); DBUG_RETURN(2);
}
DBUG_PRINT("info", ("setFrm data: 0x%lx len: %d", (long) pack_data, pack_length)); DBUG_PRINT("info", ("setFrm data: 0x%lx len: %d", (long) pack_data, pack_length));
tab.setFrm(pack_data, pack_length); tab.setFrm(pack_data, pack_length);