database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

correct merge error

Browse Source
This commit is contained in:
tomas@whalegate.ndb.mysql.com
2007-04-11 19:38:29 +02:00
parent deec4449ac
commit 537af12420
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/ha_ndbcluster.cc
View File

@@ -881,6 +881,7 @@ int get_ndb_blobs_value(TABLE* table, NdbValue* value_array,
sql_print_error("ha_ndbcluster::get_ndb_blobs_value: "
"my_malloc(%u) failed", offset);
DBUG_RETURN(-1);
}
buffer_size= offset;
}
}
@@ -8739,12 +8740,6 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
DBUG_RETURN(NULL);
}
THD_CHECK_SENTRY(thd);
if (ndb == NULL)
{
thd->cleanup();
delete thd;
DBUG_RETURN(NULL);
}
pthread_detach_this_thread();
ndb_util_thread= pthread_self();
@@ -8917,14 +8912,13 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
pthread_mutex_lock(&share->mutex);
lock= share->commit_count_lock;
pthread_mutex_unlock(&share->mutex);
if (ndb->setDatabaseName(db))
{
goto loop_next;
}
{
/* Contact NDB to get commit count for table */
Ndb* ndb= thd_ndb->ndb;
ndb->setDatabaseName(share->db);
if (ndb->setDatabaseName(share->db))
{
goto loop_next;
}
Ndb_table_guard ndbtab_g(ndb->getDictionary(), share->table_name);
if (ndbtab_g.get_table() &&
ndb_get_table_statistics(NULL, FALSE, ndb,

2
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
View File

@@ -1275,7 +1275,7 @@ NdbEventImpl::~NdbEventImpl()
int NdbEventImpl::setName(const char * name)
{
!m_name.assign(name);
return !m_name.assign(name);
}
const char *NdbEventImpl::getName() const