mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +01:00
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb sql/ha_ndbcluster_binlog.cc: Auto merged
This commit is contained in:
commit
72d99ac243
1 changed files with 6 additions and 1 deletions
|
@ -2445,8 +2445,10 @@ int ndbcluster_create_binlog_setup(Ndb *ndb, const char *key,
|
|||
pthread_mutex_unlock(&ndbcluster_mutex);
|
||||
DBUG_RETURN(1);
|
||||
}
|
||||
#ifdef NOT_YET
|
||||
if (share->connect_count !=
|
||||
g_ndb_cluster_connection->get_connect_count())
|
||||
#endif
|
||||
{
|
||||
handle_trailing_share(share);
|
||||
share= NULL;
|
||||
|
@ -2454,11 +2456,14 @@ int ndbcluster_create_binlog_setup(Ndb *ndb, const char *key,
|
|||
}
|
||||
|
||||
/* Create share which is needed to hold replication information */
|
||||
#ifdef NOT_YET
|
||||
if (share)
|
||||
{
|
||||
++share->use_count;
|
||||
}
|
||||
else if (!(share= get_share(key, 0, TRUE, TRUE)))
|
||||
else
|
||||
#endif
|
||||
if (!(share= get_share(key, 0, TRUE, TRUE)))
|
||||
{
|
||||
sql_print_error("NDB Binlog: "
|
||||
"allocating table share for %s failed", key);
|
||||
|
|
Loading…
Reference in a new issue