File tree Expand file tree Collapse file tree 2 files changed +14
-2
lines changed
storage/ndb/src/kernel/blocks Expand file tree Collapse file tree 2 files changed +14
-2
lines changed Original file line number Diff line number Diff line change @@ -13206,8 +13206,9 @@ Uint32 Dblqh::sendKeyinfo20(Signal* signal,
13206
13206
* messing with if's below...
13207
13207
*/
13208
13208
Uint32 keyLen ;
13209
- if (refToMain(ref) == SUMA && nodeId == getOwnNodeId() )
13209
+ if (refToMain(ref) == SUMA)
13210
13210
{
13211
+ ndbassert(refToNode(ref) == getOwnNodeId());
13211
13212
keyLen = 0;
13212
13213
}
13213
13214
else
Original file line number Diff line number Diff line change 1
1
/*
2
- Copyright (c) 2003, 2015 , Oracle and/or its affiliates. All rights reserved.
2
+ Copyright (c) 2003, 2017 , Oracle and/or its affiliates. All rights reserved.
3
3
4
4
This program is free software; you can redistribute it and/or modify
5
5
it under the terms of the GNU General Public License as published by
@@ -4457,6 +4457,17 @@ Suma::execKEYINFO20(Signal* signal)
4457
4457
ndbrequire (syncPtr.p ->m_headersSection != RNIL);
4458
4458
ndbrequire (syncPtr.p ->m_dataSection != RNIL);
4459
4459
4460
+ /* SUMA requests a special 'scanInfo only' KeyInfo */
4461
+ ndbassert (data->keyLen == 0 );
4462
+ ndbassert (signal->getNoOfSections () == 0 );
4463
+
4464
+ /* If there are sections, ignore them. This should never happen. */
4465
+ if (signal->getNoOfSections () > 0 )
4466
+ {
4467
+ SectionHandle handle (this , signal);
4468
+ releaseSections (handle);
4469
+ }
4470
+
4460
4471
sendScanSubTableData (signal, syncPtr, takeOver);
4461
4472
}
4462
4473
You can’t perform that action at this time.
0 commit comments