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

MDEV-35583 Tests failing on macOS

Browse Source 
These tests rely on THR_KEY_mysys but it is not initialized.  On
Linux, the corresponding thread variable is null, but on macOS it has a
nonzero value.  In all cases, initialize the variable explicitly by
calling MY_INIT and my_end appropriately.
This commit is contained in:
Dave Gosselin
2024-04-15 15:17:30 -04:00
committed by Daniel Black
parent 694d91da89
commit d92d271648
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
unittest/mysys/dynstring-t.c
View File

@@ -26,8 +26,10 @@ static void check(const char *res)
str1.length= 0; str1.length= 0;
} }
int main(void) int main(int argc, char** argv)
{ {
MY_INIT(argv[0]);
plan(23); plan(23);
IF_WIN(skip_all("Test of POSIX shell escaping rules, not for CMD.EXE\n"), ); IF_WIN(skip_all("Test of POSIX shell escaping rules, not for CMD.EXE\n"), );
@@ -69,6 +71,7 @@ int main(void)
dynstr_free(&str1); dynstr_free(&str1);
my_end(MY_CHECK_ERROR);
return exit_status(); return exit_status();
} }

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

@@ -51,6 +51,8 @@ public:
int main(int args, char **argv) int main(int args, char **argv)
{ {
MY_INIT(argv[0]);
plan(NO_PLAN); plan(NO_PLAN);
diag("Testing Json_writer checks"); diag("Testing Json_writer checks");
@@ -123,6 +125,7 @@ int main(int args, char **argv)
diag("Done"); diag("Done");
my_end(MY_CHECK_ERROR);
return exit_status(); return exit_status();
} }