Skip to content

M
mariadb
Commit a6e4ada7 authored by istruewing@chilla.local's avatar istruewing@chilla.local
Browse files
Options

After merge fix

parent 80ca34c3
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
unittest/mysys/my_atomic-t.c
View file @ a6e4ada7
...@@ -183,6 +183,8 @@ int main() ...@@ -183,6 +183,8 @@ int main()
test_atomic("my_atomic_swap32", test_atomic_swap_handler, THREADS, CYCLES); test_atomic("my_atomic_swap32", test_atomic_swap_handler, THREADS, CYCLES);
test_atomic("my_atomic_cas32", test_atomic_cas_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 workaround until we know why it crashes randomly on some machine
(BUG#22320). (BUG#22320).
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7