VladPolskiy/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-16 17:15:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for MDEV-14514: Wrong exit code when an invalid option was passed to mariadb_config.

Browse Source
This commit is contained in:
Georg Richter
2017-11-27 18:22:05 +01:00
parent 63f841f78f
commit 4ea36fd7cf
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/SearchLibrary.cmake
View File

@ -12,9 +12,8 @@ FUNCTION(SEARCH_LIBRARY library_name function liblist)
IF(${${library_name}})
RETURN()
ENDIF()
CHECK_FUNCTION_EXISTS(${function} ${function}_IS_SYS_FUNC)
# check if function is part of libc
IF(HAVE_${function}_IS_SYS_FUNC)
CHECK_FUNCTION_EXISTS(${function} IS_${function}_LIBC_FUNC)
IF(IS_${function}_LIBC_FUNC)
SET(${library_name} "" PARENT_SCOPE)
RETURN()
ENDIF()

4
mariadb_config/mariadb_config.c.in
View File

@ -72,7 +72,7 @@ int main(int argc, char **argv)
if (argc <= 1)
{
usage();
exit(1);
exit(0);
}
while(1)
@ -116,7 +116,7 @@ int main(int argc, char **argv)
puts(LIBS_SYS);
break;
default:
exit(0);
exit((c != -1));
}
}