diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-14 18:06:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-14 18:06:51 +0300 |
| commit | 1d15a28e52e41fae0847284089b2073ab33162a5 (patch) | |
| tree | 3d2dbd3ebda6547c26642e597b5cafc56e7ed031 /unittest | |
| parent | c4feef50cfa4033e646636ed37e255d2b3593fbf (diff) | |
| parent | a20f6f9853e522ad388f5b968ce11af3c5d1fc10 (diff) | |
| download | mariadb-git-1d15a28e52e41fae0847284089b2073ab33162a5.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'unittest')
| -rw-r--r-- | unittest/mysys/my_atomic-t.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unittest/mysys/my_atomic-t.c b/unittest/mysys/my_atomic-t.c index 4796cc424d8..52bced7ce3b 100644 --- a/unittest/mysys/my_atomic-t.c +++ b/unittest/mysys/my_atomic-t.c @@ -90,10 +90,10 @@ pthread_handler_t test_atomic_cas(void *arg) y= my_atomic_load32(&bad); x= (x*m+0x87654321) & INT_MAX32; do { - ok= my_atomic_cas32(&bad, &y, (uint32)y+x); + ok= my_atomic_cas32((int32*) &bad, &y, y+x); } while (!ok) ; do { - ok= my_atomic_cas32(&bad, &y, y-x); + ok= my_atomic_cas32((int32*) &bad, &y, y-x); } while (!ok) ; } return 0; |