summaryrefslogtreecommitdiff
path: root/unittest
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2016-11-02 15:27:12 +0400
committerSergey Vojtovich <svoj@mariadb.org>2016-12-13 16:38:20 +0400
commit8f9999b5fc658431cac66cf07b51b3f469faa20a (patch)
tree54f1c20a96f5775432fd0838c0d9c9230908f2ea /unittest
parent1369e70b561a53dd77da3c0b87217cf2d6c8328d (diff)
downloadmariadb-git-8f9999b5fc658431cac66cf07b51b3f469faa20a.tar.gz
MDEV-11212 - Clean-up MariaDB atomic operations
Removed my_atomic_initialize(): it doesn't make sense anymore.
Diffstat (limited to 'unittest')
-rw-r--r--unittest/mysys/lf-t.c5
-rw-r--r--unittest/mysys/my_atomic-t.c6
-rw-r--r--unittest/mysys/waiting_threads-t.c5
3 files changed, 3 insertions, 13 deletions
diff --git a/unittest/mysys/lf-t.c b/unittest/mysys/lf-t.c
index cb0c2853d13..abfa74877f8 100644
--- a/unittest/mysys/lf-t.c
+++ b/unittest/mysys/lf-t.c
@@ -182,15 +182,12 @@ pthread_handler_t test_lf_hash(void *arg)
void do_tests()
{
- plan(7);
+ plan(6);
lf_alloc_init(&lf_allocator, sizeof(TLA), offsetof(TLA, not_used));
lf_hash_init(&lf_hash, sizeof(int), LF_HASH_UNIQUE, 0, sizeof(int), 0,
&my_charset_bin);
- bad= my_atomic_initialize();
- ok(!bad, "my_atomic_initialize() returned %d", bad);
-
with_my_thread_init= 1;
test_concurrently("lf_pinbox (with my_thread_init)", test_lf_pinbox, N= THREADS, CYCLES);
test_concurrently("lf_alloc (with my_thread_init)", test_lf_alloc, N= THREADS, CYCLES);
diff --git a/unittest/mysys/my_atomic-t.c b/unittest/mysys/my_atomic-t.c
index 0f21c33455e..79e93b36ad9 100644
--- a/unittest/mysys/my_atomic-t.c
+++ b/unittest/mysys/my_atomic-t.c
@@ -118,11 +118,7 @@ pthread_handler_t test_atomic_cas(void *arg)
void do_tests()
{
- plan(6);
-
- bad= my_atomic_initialize();
- ok(!bad, "my_atomic_initialize() returned %d", bad);
-
+ plan(5);
b32= c32= 0;
test_concurrently("my_atomic_add32", test_atomic_add, THREADS, CYCLES);
diff --git a/unittest/mysys/waiting_threads-t.c b/unittest/mysys/waiting_threads-t.c
index 35e86aca319..66b9258185e 100644
--- a/unittest/mysys/waiting_threads-t.c
+++ b/unittest/mysys/waiting_threads-t.c
@@ -186,14 +186,11 @@ void do_tests()
skip(1, "Big test skipped");
return;
}
- plan(14);
+ plan(13);
compile_time_assert(THREADS >= 4);
DBUG_PRINT("wt", ("================= initialization ==================="));
- bad= my_atomic_initialize();
- ok(!bad, "my_atomic_initialize() returned %d", bad);
-
pthread_cond_init(&thread_sync, 0);
pthread_mutex_init(&lock, 0);
wt_init();