mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-17 20:37:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.5 into 10.6

Browse source
This commit is contained in:
Marko Mäkelä 2024-12-11 14:46:43 +02:00
commit 69e20cab28
24 changed files with 55 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

7
storage/mroonga/vendor/groonga/src/groonga_benchmark.c vendored
View file

@ -271,12 +271,7 @@ error_exit_in_thread(intptr_t code)
CRITICAL_SECTION_ENTER(grntest_cs);
grntest_stop_flag = 1;
CRITICAL_SECTION_LEAVE(grntest_cs);
#ifdef WIN32
_endthreadex(code);
#else
pthread_exit((void *)code);
#endif /* WIN32 */
return 0;
return code;
}