Commit 078120fe authored by thek@adventure.(none)'s avatar thek@adventure.(none)
Browse files

Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime

into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
parents c941b9f3 0a6cf809
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ void my_thread_global_end(void)
#endif
}

static long thread_id=0;
static ulong thread_id=0;

/*
  Allocate thread specific memory for the thread, used by mysys and dbug