Skip to content

Commit 4ea36fd

Browse files
committed
Fix for MDEV-14514: Wrong exit code when an invalid option was passed to mariadb_config.
1 parent 63f841f commit 4ea36fd

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

cmake/SearchLibrary.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ FUNCTION(SEARCH_LIBRARY library_name function liblist)
1212
IF(${${library_name}})
1313
RETURN()
1414
ENDIF()
15-
CHECK_FUNCTION_EXISTS(${function} ${function}_IS_SYS_FUNC)
16-
# check if function is part of libc
17-
IF(HAVE_${function}_IS_SYS_FUNC)
15+
CHECK_FUNCTION_EXISTS(${function} IS_${function}_LIBC_FUNC)
16+
IF(IS_${function}_LIBC_FUNC)
1817
SET(${library_name} "" PARENT_SCOPE)
1918
RETURN()
2019
ENDIF()

mariadb_config/mariadb_config.c.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
7272
if (argc <= 1)
7373
{
7474
usage();
75-
exit(1);
75+
exit(0);
7676
}
7777

7878
while(1)
@@ -116,7 +116,7 @@ int main(int argc, char **argv)
116116
puts(LIBS_SYS);
117117
break;
118118
default:
119-
exit(0);
119+
exit((c != -1));
120120
}
121121
}
122122

0 commit comments

Comments
 (0)