Commit af5c95c2 authored by Guilhem Bichot's avatar Guilhem Bichot

This patch is for 5.5.

WL#5914 remove option "--all" of the "perror" program.
In 5.5 we just give a deprecation warning; in trunk we remove the option.
parent e1aa1f87
/* Copyright (C) 2000 MySQL AB /* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
/* Return error-text for system error messages and handler messages */ /* Return error-text for system error messages and handler messages */
...@@ -64,7 +64,8 @@ static struct my_option my_long_options[] = ...@@ -64,7 +64,8 @@ static struct my_option my_long_options[] =
&ndb_code, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, &ndb_code, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
#endif #endif
#ifdef HAVE_SYS_ERRLIST #ifdef HAVE_SYS_ERRLIST
{"all", 'a', "Print all the error messages and the number.", {"all", 'a', "Print all the error messages and the number. Deprecated,"
" will be removed in a future release.",
&print_all_codes, &print_all_codes, 0, GET_BOOL, NO_ARG, &print_all_codes, &print_all_codes, 0, GET_BOOL, NO_ARG,
0, 0, 0, 0, 0, 0}, 0, 0, 0, 0, 0, 0},
#endif #endif
...@@ -295,6 +296,8 @@ int main(int argc,char *argv[]) ...@@ -295,6 +296,8 @@ int main(int argc,char *argv[])
if (print_all_codes) if (print_all_codes)
{ {
HA_ERRORS *ha_err_ptr; HA_ERRORS *ha_err_ptr;
printf("WARNING: option '-a/--all' is deprecated and will be removed in a"
" future release.\n");
for (code=1 ; code < sys_nerr ; code++) for (code=1 ; code < sys_nerr ; code++)
{ {
if (sys_errlist[code] && sys_errlist[code][0]) if (sys_errlist[code] && sys_errlist[code][0])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment