Skip to content

M
MariaDB
Commit beb401b2 authored by Rucha Deodhar's avatar Rucha Deodhar
Browse files
Options

This commit is a fixup for MDEV-22189. 

Changes:
changed mysqld -> mariadbd for some more error messages that were left.
parent bdae5508
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
mysql-test/main/mysqld--help.result
View file @ beb401b2
......@@ -1844,5 +1844,5 @@ userstat FALSE
verbose TRUE
wait-timeout 28800
To see what variables a running MySQL server is using, type
'mysqladmin variables' instead of 'mysqld --verbose --help'.
To see what variables a running server is using, type
'SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES' instead of 'mysqld --verbose --help' or 'mariadbd --verbose --help'.
mysql-test/main/tc_heuristic_recover.result
View file @ beb401b2
......@@ -22,11 +22,11 @@ NOT FOUND /\[ERROR\] Can\'t init tc log/ in mysqld.1.err
FOUND 2 /was in the XA prepared state/ in mysqld.1.err
FOUND 1 /Found 1 prepared transactions!/ in mysqld.1.err
FOUND 1 /\[ERROR\] Can\'t init tc log/ in mysqld.1.err
FOUND 1 /Please restart mysqld without --tc-heuristic-recover/ in mysqld.1.err
FOUND 1 /Please restart without --tc-heuristic-recover/ in mysqld.1.err
FOUND 3 /was in the XA prepared state/ in mysqld.1.err
FOUND 1 /Found 1 prepared transactions!/ in mysqld.1.err
FOUND 2 /\[ERROR\] Can\'t init tc log/ in mysqld.1.err
FOUND 2 /Please restart mysqld without --tc-heuristic-recover/ in mysqld.1.err
FOUND 2 /Please restart without --tc-heuristic-recover/ in mysqld.1.err
# restart
FOUND 3 /was in the XA prepared state/ in mysqld.1.err
FOUND 1 /Found 1 prepared transactions!/ in mysqld.1.err
......
mysql-test/main/tc_heuristic_recover.test
View file @ beb401b2
......@@ -66,7 +66,7 @@ SELECT * FROM t1;
--source include/search_pattern_in_file.inc
--let SEARCH_PATTERN= \\[ERROR\\] Can\\'t init tc log
--source include/search_pattern_in_file.inc
--let SEARCH_PATTERN= Please restart mysqld without --tc-heuristic-recover
--let SEARCH_PATTERN= Please restart without --tc-heuristic-recover
--source include/search_pattern_in_file.inc
--error 1
......@@ -78,7 +78,7 @@ SELECT * FROM t1;
--source include/search_pattern_in_file.inc
--let SEARCH_PATTERN= \\[ERROR\\] Can\\'t init tc log
--source include/search_pattern_in_file.inc
--let SEARCH_PATTERN= Please restart mysqld without --tc-heuristic-recover
--let SEARCH_PATTERN= Please restart without --tc-heuristic-recover
--source include/search_pattern_in_file.inc
--source include/start_mysqld.inc
......
sql/handler.cc
View file @ beb401b2
......@@ -2731,10 +2731,10 @@ int ha_recover(HASH *commit_list, MEM_ROOT *arg_mem_root)
info.found_foreign_xids);
if (info.dry_run && info.found_my_xids)
{
sql_print_error("Found %d prepared transactions! It means that mysqld was "
sql_print_error("Found %d prepared transactions! It means that server was "
"not shut down properly last time and critical recovery "
"information (last binlog or %s file) was manually deleted "
"after a crash. You have to start mysqld with "
"after a crash. You have to start server with "
"--tc-heuristic-recover switch to commit or rollback "
"pending transactions.",
info.found_my_xids, opt_tc_log_file);
......
sql/log.cc
View file @ beb401b2
......@@ -2534,7 +2534,7 @@ int check_binlog_magic(IO_CACHE* log, const char** errmsg)
}
if (bcmp(magic, BINLOG_MAGIC, sizeof(magic)))
{
*errmsg = "Binlog has bad magic number; It's not a binary log file that can be used by this version of MySQL";
*errmsg = "Binlog has bad magic number; It's not a binary log file that can be used by this version of MariaDB";
return 1;
}
return 0;
......@@ -9953,7 +9953,7 @@ int TC_LOG_MMAP::recover()
err1:
sql_print_error("Crash recovery failed. Either correct the problem "
"(if it's, for example, out of memory error) and restart, "
"or delete tc log and start mysqld with "
"or delete tc log and start server with "
"--tc-heuristic-recover={commit|rollback}");
return 1;
}
......@@ -9984,7 +9984,7 @@ int TC_LOG::using_heuristic_recover()
sql_print_information("Heuristic crash recovery mode");
if (ha_recover(0))
sql_print_error("Heuristic crash recovery failed");
sql_print_information("Please restart mysqld without --tc-heuristic-recover");
sql_print_information("Please restart without --tc-heuristic-recover");
return 1;
}
......@@ -11417,7 +11417,7 @@ int TC_LOG_BINLOG::recover(LOG_INFO *linfo, const char *last_log_name,
err1:
sql_print_error("Crash recovery failed. Either correct the problem "
"(if it's, for example, out of memory error) and restart, "
"or delete (or rename) binary log and start mysqld with "
"or delete (or rename) binary log and start serverwith "
"--tc-heuristic-recover={commit|rollback}");
DBUG_RETURN(1);
}
......
sql/mysqld.cc
View file @ beb401b2
......@@ -2330,7 +2330,7 @@ static void activate_tcp_port(uint port,
sprintf(buff, "Can't start server: Bind on TCP/IP port. Got error: %d",
(int) socket_errno);
sql_perror(buff);
sql_print_error("Do you already have another mysqld server running on "
sql_print_error("Do you already have another server running on "
"port: %u ?", port);
unireg_abort(1);
}
......@@ -2588,7 +2588,7 @@ static void network_init(void)
port_len) < 0)
{
sql_perror("Can't start server : Bind on unix socket"); /* purecov: tested */
sql_print_error("Do you already have another mysqld server running on socket: %s ?",mysqld_unix_port);
sql_print_error("Do you already have another server running on socket: %s ?",mysqld_unix_port);
unireg_abort(1); /* purecov: tested */
}
umask(((~my_umask) & 0666));
......@@ -3123,7 +3123,7 @@ pthread_handler_t signal_hand(void *arg __attribute__((unused)))
case SIGQUIT:
case SIGKILL:
#ifdef EXTRA_DEBUG
sql_print_information("Got signal %d to shutdown mysqld",sig);
sql_print_information("Got signal %d to shutdown server",sig);
#endif
/* switch to the old log message processing */
logger.set_handlers(LOG_FILE, global_system_variables.sql_log_slow ? LOG_FILE:LOG_NONE,
......@@ -3856,7 +3856,7 @@ static int init_common_variables()
/* TODO: remove this when my_time_t is 64 bit compatible */
if (!IS_TIME_T_VALID_FOR_TIMESTAMP(server_start_time))
{
sql_print_error("This MySQL server doesn't support dates later than 2038");
sql_print_error("This server doesn't support dates later than 2038");
exit(1);
}
......@@ -3947,13 +3947,13 @@ static int init_common_variables()
if (!opt_abort)
{
if (IS_SYSVAR_AUTOSIZE(&server_version_ptr))
sql_print_information("%s (mysqld %s) starting as process %lu ...",
sql_print_information("%s (server %s) starting as process %lu ...",
my_progname, server_version, (ulong) getpid());
else
{
char real_server_version[SERVER_VERSION_LENGTH];
set_server_version(real_server_version, sizeof(real_server_version));
sql_print_information("%s (mysqld %s as %s) starting as process %lu ...",
sql_print_information("%s (server %s as %s) starting as process %lu ...",
my_progname, real_server_version, server_version,
(ulong) getpid());
}
......@@ -5255,7 +5255,7 @@ static int init_server_components()
#ifdef USE_ARIA_FOR_TMP_TABLES
if (!ha_storage_engine_is_enabled(maria_hton) && !opt_bootstrap)
{
sql_print_error("Aria engine is not enabled or did not start. The Aria engine must be enabled to continue as mysqld was configured with --with-aria-tmp-tables");
sql_print_error("Aria engine is not enabled or did not start. The Aria engine must be enabled to continue as server was configured with --with-aria-tmp-tables");
unireg_abort(1);
}
#endif
......@@ -6124,7 +6124,7 @@ void handle_connections_sockets()
*/
statistic_increment(connection_errors_accept, &LOCK_status);
if (!select_errors++ && !abort_loop) /* purecov: inspected */
sql_print_error("mysqld: Got error %d from select",socket_errno); /* purecov: inspected */
sql_print_error("Server: Got error %d from select",socket_errno); /* purecov: inspected */
}
continue;
}
......@@ -7567,8 +7567,8 @@ static void usage(void)
"\nbecause execution stopped before plugins were initialized.");
}
puts("\nTo see what variables a running MySQL server is using, type"
"\n'mysqladmin variables' instead of 'mysqld --verbose --help'.");
puts("\nTo see what variables a running server is using, type"
"\n'SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES' instead of 'mysqld --verbose --help' or 'mariadbd --verbose --help'.");
}
DBUG_VOID_RETURN;
}
......
storage/innobase/handler/ha_innodb.cc
View file @ beb401b2
......@@ -14546,7 +14546,7 @@ ha_innobase::info_low(
sql_print_error(
"Index %s of %s has %u columns"
" unique inside InnoDB, but "
"MySQL is asking statistics for"
"server is asking statistics for"
" %lu columns. Have you mixed "
"up .frm files from different "
" installations? %s",
......
libmarias3 @ 0d48bf33
Subproject commit c71898f8259829bf4b2e01072000491281e5206d
Subproject commit 0d48bf334fde7d4e0dac22bda560e86037d35d77
storage/rocksdb/rdb_utils.cc
View file @ beb401b2
......@@ -346,7 +346,7 @@ void rdb_persist_corruption_marker() {
} else {
// NO_LINT_DEBUG
sql_print_information(
"RocksDB: Creating the file %s to abort mysqld "
"RocksDB: Creating the file %s to abort server "
"restarts. Remove this file from the data directory "
"after fixing the corruption to recover. ",
fileName.c_str());
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7