mirror of
https://github.com/MariaDB/server.git
synced 2025-01-26 00:34:18 +01:00
MDEV-35583 Tests failing on macOS
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:
parent
694d91da89
commit
d92d271648
2 changed files with 7 additions and 1 deletions
unittest
|
@ -26,8 +26,10 @@ static void check(const char *res)
|
|||
str1.length= 0;
|
||||
}
|
||||
|
||||
int main(void)
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
MY_INIT(argv[0]);
|
||||
|
||||
plan(23);
|
||||
|
||||
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);
|
||||
|
||||
my_end(MY_CHECK_ERROR);
|
||||
return exit_status();
|
||||
}
|
||||
|
||||
|
|
|
@ -51,6 +51,8 @@ public:
|
|||
|
||||
int main(int args, char **argv)
|
||||
{
|
||||
MY_INIT(argv[0]);
|
||||
|
||||
plan(NO_PLAN);
|
||||
diag("Testing Json_writer checks");
|
||||
|
||||
|
@ -123,6 +125,7 @@ int main(int args, char **argv)
|
|||
|
||||
diag("Done");
|
||||
|
||||
my_end(MY_CHECK_ERROR);
|
||||
return exit_status();
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue