mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
Improve error messages
- mysql_install_db now prints position to error file, if log-error is used - Warning about compatibility now mentions MySQL 5.6 and 5.7 - Give warning if --show_compatibility_56 is used
This commit is contained in:
parent
cfaaace635
commit
c24d1d665c
3 changed files with 15 additions and 7 deletions
|
@ -4418,7 +4418,7 @@ sub extract_warning_lines ($$) {
|
|||
qr|feedback plugin: failed to retrieve the MAC address|,
|
||||
qr|Plugin 'FEEDBACK' init function returned error|,
|
||||
qr|Plugin 'FEEDBACK' registration as a INFORMATION SCHEMA failed|,
|
||||
qr|'log-bin-use-v1-row-events' is MySQL 5.6 compatible option|,
|
||||
qr|'log-bin-use-v1-row-events' is MySQL .* compatible option|,
|
||||
qr|InnoDB: Setting thread \d+ nice to \d+ failed, current nice \d+, errno 13|, # setpriority() fails under valgrind
|
||||
qr|Failed to setup SSL|,
|
||||
qr|SSL error: Failed to set ciphers to use|,
|
||||
|
|
|
@ -24,6 +24,7 @@ builddir=""
|
|||
ldata="@localstatedir@"
|
||||
langdir=""
|
||||
srcdir=""
|
||||
log_error=""
|
||||
|
||||
args=""
|
||||
defaults=""
|
||||
|
@ -136,6 +137,8 @@ parse_arguments()
|
|||
--builddir=*) builddir=`parse_arg "$arg"` ;;
|
||||
--srcdir=*) srcdir=`parse_arg "$arg"` ;;
|
||||
--ldata=*|--datadir=*|--data=*) ldata=`parse_arg "$arg"` ;;
|
||||
--log-error=*)
|
||||
log_error=`parse_arg "$arg"` ;;
|
||||
--user=*)
|
||||
# Note that the user will be passed to mysqld so that it runs
|
||||
# as 'user' (crucial e.g. if log-bin=/some_other_path/
|
||||
|
@ -147,7 +150,6 @@ parse_arguments()
|
|||
--help) usage ;;
|
||||
--no-defaults|--defaults-file=*|--defaults-extra-file=*)
|
||||
defaults="$arg" ;;
|
||||
|
||||
--cross-bootstrap|--windows)
|
||||
# Used when building the MariaDB system tables on a different host than
|
||||
# the target. The platform-independent files that are created in
|
||||
|
@ -475,9 +477,14 @@ if { echo "use mysql;$install_params"; cat "$create_system_tables" "$create_syst
|
|||
then
|
||||
s_echo "OK"
|
||||
else
|
||||
log_file_place=$ldata
|
||||
if test -n "$log_error"
|
||||
then
|
||||
log_file_place="$log_error or $log_file_place"
|
||||
fi
|
||||
echo
|
||||
echo "Installation of system tables failed! Examine the logs in"
|
||||
echo "$ldata for more information."
|
||||
echo "$log_file_place for more information."
|
||||
echo
|
||||
echo "The problem could be conflicting information in an external"
|
||||
echo "my.cnf files. You can ignore these by doing:"
|
||||
|
|
|
@ -7759,6 +7759,7 @@ struct my_option my_long_options[]=
|
|||
MYSQL_SUGGEST_ANALOG_OPTION("max-binlog-dump-events", "--debug-max-binlog-dump-events"),
|
||||
MYSQL_SUGGEST_ANALOG_OPTION("sporadic-binlog-dump-fail", "--debug-sporadic-binlog-dump-fail"),
|
||||
MYSQL_COMPATIBILITY_OPTION("new"),
|
||||
MYSQL_COMPATIBILITY_OPTION("show_compatibility_56"),
|
||||
|
||||
/* The following options were added after 5.6.10 */
|
||||
MYSQL_TO_BE_IMPLEMENTED_OPTION("rpl-stop-slave-timeout"),
|
||||
|
@ -9044,12 +9045,12 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument)
|
|||
opt->name);
|
||||
break;
|
||||
case OPT_MYSQL_COMPATIBILITY:
|
||||
sql_print_warning("'%s' is MySQL 5.6 compatible option. Not used or needed "
|
||||
"in MariaDB.", opt->name);
|
||||
sql_print_warning("'%s' is MySQL 5.6 / 5.7 compatible option. Not used or "
|
||||
"needed in MariaDB.", opt->name);
|
||||
break;
|
||||
case OPT_MYSQL_TO_BE_IMPLEMENTED:
|
||||
sql_print_warning("'%s' is MySQL 5.6 compatible option. To be implemented "
|
||||
"in later versions.", opt->name);
|
||||
sql_print_warning("'%s' is MySQL 5.6 / 5.7 compatible option. To be "
|
||||
"implemented in later versions.", opt->name);
|
||||
break;
|
||||
case 'a':
|
||||
SYSVAR_AUTOSIZE(global_system_variables.sql_mode, MODE_ANSI);
|
||||
|
|
Loading…
Reference in a new issue