diff options
author | Alexander Nozdrin <alik@sun.com> | 2010-07-23 16:18:20 +0400 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2010-07-23 16:18:20 +0400 |
commit | b3a11e66a73f4cacc2f48bec8d51efa27bb4b07b (patch) | |
tree | ec0d5e30711ea7f58dc204f0788587f6f770b140 /extra/perror.c | |
parent | e875a1d66b83b758c34d2190ffd180bd626327ea (diff) | |
parent | 74d67316829134f04bac656879408d4f7f2de8a4 (diff) | |
download | mariadb-git-b3a11e66a73f4cacc2f48bec8d51efa27bb4b07b.tar.gz |
Auto-merge from mysql-trunk-bugfixing.
Diffstat (limited to 'extra/perror.c')
-rw-r--r-- | extra/perror.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/extra/perror.c b/extra/perror.c index be9a47d63a4..382805c5dfd 100644 --- a/extra/perror.c +++ b/extra/perror.c @@ -102,8 +102,6 @@ static HA_ERRORS ha_errlist[]= }; -#include <help_start.h> - static void print_version(void) { printf("%s Ver %s, for %s (%s)\n",my_progname,PERROR_VERSION, @@ -122,8 +120,6 @@ static void usage(void) my_print_variables(my_long_options); } -#include <help_end.h> - static my_bool get_one_option(int optid, const struct my_option *opt __attribute__((unused)), @@ -281,7 +277,7 @@ int main(int argc,char *argv[]) #endif { /* - On some system, like NETWARE, strerror(unknown_error) returns a + On some system, like Linux, strerror(unknown_error) returns a string 'Unknown Error'. To avoid printing it we try to find the error string by asking for an impossible big error message. |