summaryrefslogtreecommitdiff
path: root/unittest
diff options
context:
space:
mode:
authorunknown <serg@janus.mylan>2006-10-18 17:24:07 +0200
committerunknown <serg@janus.mylan>2006-10-18 17:24:07 +0200
commit12a55aeabc353fdc1c3829ddd8baacb142160c80 (patch)
tree660c00763097e4fd6cbb954397696684f6d4b810 /unittest
parent67a2b7cf298d0a351256ab13c2577c32e20bd723 (diff)
downloadmariadb-git-12a55aeabc353fdc1c3829ddd8baacb142160c80.tar.gz
lock manager passed unit tests
storage/maria/trnman.c: comments include/my_dbug.h: make DBUG_ASSERT always a statement storage/maria/lockman.h: comments include/lf.h: lf_pinbox - don't use a fixed-size purgatory. mysys/lf_alloc-pin.c: lf_pinbox - don't use a fixed-size purgatory. mysys/lf_hash.c: lf_pinbox - don't use a fixed-size purgatory. storage/maria/lockman.c: removed IGNORE_ME/UPGDARED matching - it was wrong in the first place. updated for "lf_pinbox - don't use a fixed-size purgatory" storage/maria/unittest/lockman-t.c: IGNORE_ME/UPGRADED pair counting bugtest. more tests unittest/mysys/my_atomic-t.c: lf_pinbox - don't use a fixed-size purgatory.
Diffstat (limited to 'unittest')
-rw-r--r--unittest/mysys/my_atomic-t.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/unittest/mysys/my_atomic-t.c b/unittest/mysys/my_atomic-t.c
index 881f80a66f8..e2177b94720 100644
--- a/unittest/mysys/my_atomic-t.c
+++ b/unittest/mysys/my_atomic-t.c
@@ -154,7 +154,7 @@ pthread_handler_t test_lf_pinbox(void *arg)
typedef union {
int32 data;
- void *not_used; /* to guarantee sizeof(TLA) >= sizeof(void *) */
+ void *not_used;
} TLA;
pthread_handler_t test_lf_alloc(void *arg)
@@ -294,7 +294,7 @@ int main()
pthread_mutex_init(&mutex, 0);
pthread_cond_init(&cond, 0);
my_atomic_rwlock_init(&rwl);
- lf_alloc_init(&lf_allocator, sizeof(TLA));
+ 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);