Commit c54295f7 authored by unknown's avatar unknown

Merge perch.ndb.mysql.com:/home/jonas/src/41-work

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
parents 8af99710 b81cc9c3
...@@ -8475,7 +8475,7 @@ Dbdih::resetReplicaSr(TabRecordPtr tabPtr){ ...@@ -8475,7 +8475,7 @@ Dbdih::resetReplicaSr(TabRecordPtr tabPtr){
ConstPtr<ReplicaRecord> constReplicaPtr; ConstPtr<ReplicaRecord> constReplicaPtr;
constReplicaPtr.i = replicaPtr.i; constReplicaPtr.i = replicaPtr.i;
constReplicaPtr.p = replicaPtr.p; constReplicaPtr.p = replicaPtr.p;
if (tabPtr.p->tabStorage != TabRecord::ST_NORMAL || if (tabPtr.p->storedTable == 0 ||
setup_create_replica(fragPtr, setup_create_replica(fragPtr,
&createReplica, constReplicaPtr)) &createReplica, constReplicaPtr))
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment