diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-08-14 12:42:06 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-08-14 12:42:06 +0300 |
| commit | b34c8645cdb301140327528a76a79a9e68c25611 (patch) | |
| tree | cb49384a1f2715f859ecea334f20bf4a46ecbcce /unittest/mysys/my_atomic-t.c | |
| parent | 7772c7cd945cf674b212b82f4d156099c67344a2 (diff) | |
| parent | 65d48b4a7bd7a57a27f2e9ca54473e1ae86223b5 (diff) | |
| download | mariadb-git-b-10.3-10.3-merge.tar.gz | |
Merge 10.3 into 10.4b-10.3-10.3-merge
Conflicts:
mysql-test/suite/galera/disabled.def (resolved)
mysql-test/suite/galera/r/MW-328A.result (run tests)
mysql-test/suite/innodb/r/alter_copy.result (needs check)
mysql-test/suite/innodb/t/trx_id_future.test (needs check)
sql/opt_range.cc (needs check)
sql/share/errmsg-utf8.txt (needs check)
sql/sql_parse.cc (needs check)
sql/sql_select.cc (needs check)
sql/sql_table.cc (need check)
sql/wsrep_mysqld.cc (resolved)
sql/wsrep_sst.cc (resolved)
sql/wsrep_thd.cc (resolved)
Diffstat (limited to 'unittest/mysys/my_atomic-t.c')
| -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; |