sql/mysqld.cc

    fixed concurrency bug with a very quickly disconnecting client -
    the client could disconnect and delete thd before pthread_create 
    could write to &thd->real_id 
sql/sql_list.h
    while tracking down the bug, made new/delete go through my_malloc/my_free
    for ilink - did not help, but this is better anyway - cleaner exit with a message in
    out of memory codition at least.

1 files changed, 9 insertions, 0 deletions

diff --git a/sql/sql_list.h b/sql/sql_list.h
index 965d1ff9308..b86250f70b6 100644
--- a/sql/sql_list.h
+++ b/sql/sql_list.h
@@ -225,6 +225,15 @@ public:
 
 struct ilink {
   struct ilink **prev,*next;
+  static void *operator new(size_t size)
+  {
+    return (void*)my_malloc((uint)size, MYF(MY_WME | MY_FAE));
+  }
+  static void operator delete(void* ptr_arg, size_t size)
+  {
+     my_free((gptr)ptr_arg, MYF(MY_WME|MY_ALLOW_ZERO_PTR));
+  }
+
   inline ilink()
   {
     prev=0; next=0;