Commit da35bb1b authored by unknown's avatar unknown

Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug18881

into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge


ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
parents bf8f30b5 1a72428a
...@@ -111,6 +111,7 @@ EmulatorData::destroy(){ ...@@ -111,6 +111,7 @@ EmulatorData::destroy(){
delete theSimBlockList; theSimBlockList = 0; delete theSimBlockList; theSimBlockList = 0;
if(m_socket_server) if(m_socket_server)
delete m_socket_server; m_socket_server = 0; delete m_socket_server; m_socket_server = 0;
NdbMutex_Destroy(theShutdownMutex);
NdbMem_Destroy(); NdbMem_Destroy();
} }
......
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