Skip to content

Commit 19b96f8

Browse files
committed
WL#15524 Patch #2 TLS-safe upgrade of mgm socket to transporter
Post push fix. NdbSocket::copy method duplicated the mutex pointer, leaving two objects referring to one mutex. Typically the source will destroy its mutex, making it unusable for target object. Remove copy method. Change-Id: I2cc36128c343c7bab08d96651b12946ecd87210c
1 parent 86c868d commit 19b96f8

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

storage/ndb/include/util/NdbSocket.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,9 @@ class NdbSocket {
4747
* NdbSockets should be copied using NdbSocket::transfer(), which
4848
* invalidates the original, and transfers ownership of its ssl and
4949
* mutex.
50-
*
51-
* NdbSocket::copy() should only be used when the original is going
52-
* out of scope.
5350
*/
5451
static void transfer(NdbSocket & newSocket, NdbSocket & original);
5552
static NdbSocket transfer(NdbSocket & original);
56-
static NdbSocket copy(const NdbSocket &s) { return s; }
5753

5854
void init_from_new(ndb_socket_t);
5955
void init_from_native(socket_t fd) { ndb_socket_init_from_native(s, fd); }

0 commit comments

Comments
 (0)