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

Merge 10.5 into 10.6

This commit is contained in:
Marko Mäkelä
2024-04-17 14:14:58 +03:00
159 changed files with 2361 additions and 2119 deletions

View File

@@ -378,10 +378,10 @@ int main(int argc __attribute__((unused)), char **argv)
"res:%d, argc:%d, opt_ull:%llu", res, arg_c, opt_ull);
run("--ull=-100", NULL);
ok(res==9 && arg_c==1 && opt_ull==0ULL,
ok(res==13 && arg_c==0 && opt_ull==0ULL,
"res:%d, argc:%d, opt_ull:%llu", res, arg_c, opt_ull);
run("--ul=-100", NULL);
ok(res==9 && arg_c==1 && opt_ul==0UL,
ok(res==13 && arg_c==0 && opt_ul==0UL,
"res:%d, argc:%d, opt_ul:%lu", res, arg_c, opt_ul);
my_end(0);