database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.2 to 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2019-08-13 19:28:51 +03:00
parent eedd6179c1 ed4ccf34a6
commit 65d48b4a7b
81 changed files with 1703 additions and 987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
unittest/mysys/my_atomic-t.c
View File

@@ -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;