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

Merge 10.6 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2024-12-19 15:38:53 +02:00
parent c391fb1ff1 c982a143fc
commit a54d151fc1
129 changed files with 1398 additions and 1726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
unittest/sql/my_apc-t.cc
View File

@@ -108,7 +108,6 @@ void *test_apc_service_thread(void *ptr)
apc_target.destroy();
mysql_mutex_destroy(&target_mutex);
my_thread_end();
pthread_exit(0);
return NULL;
}

3
unittest/sql/my_json_writer-t.cc
View File

@@ -54,6 +54,8 @@ constexpr uint FAKE_SELECT_LEX_ID= UINT_MAX;
int main(int args, char **argv)
{
MY_INIT(argv[0]);
plan(NO_PLAN);
diag("Testing Json_writer checks");
@@ -141,6 +143,7 @@ int main(int args, char **argv)
diag("Done");
my_end(MY_CHECK_ERROR);
return exit_status();
}