bk commit into 5.1 tree (istruewing:1.2419)

[ingo]

Below is the list of changes that have just been committed into a local
5.1 repository of istruewing. When istruewing does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-02-02 17:47:13+01:00, istruewing@stripped +1 -0
  After merge fix

  unittest/mysys/my_atomic-t.c@stripped, 2007-02-02 17:47:10+01:00, istruewing@stripped +2
-0
    After merge fix

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	istruewing
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.1-axmrg

--- 1.8/unittest/mysys/my_atomic-t.c	2007-02-02 17:47:22 +01:00
+++ 1.9/unittest/mysys/my_atomic-t.c	2007-02-02 17:47:22 +01:00
@@ -183,6 +183,8 @@ int main()
   test_atomic("my_atomic_swap32", test_atomic_swap_handler, THREADS, CYCLES);
   test_atomic("my_atomic_cas32", test_atomic_cas_handler, THREADS, CYCLES);
 
+  /* workaround until we know why this includes dbug but not safemalloc */
+  if(err) { my_thread_global_init(); my_free(my_malloc(0, MYF(0)), MYF(0)); }
   /*
     workaround until we know why it crashes randomly on some machine
     (BUG#22320).