Fix typos in user-facing messages
This commit is contained in:
parent
c36cd56049
commit
1e00b9ec2a
@ -5588,7 +5588,7 @@ fail:
|
||||
|
||||
/* Populate fil_system with tablespaces to copy */
|
||||
if (dberr_t err = xb_load_tablespaces()) {
|
||||
msg("merror: xb_load_tablespaces() failed with"
|
||||
msg("error: xb_load_tablespaces() failed with"
|
||||
" error %s.", ut_strerr(err));
|
||||
log_copying_running = false;
|
||||
goto fail;
|
||||
|
@ -242,7 +242,7 @@ T}
|
||||
T{
|
||||
MTR_VERSION
|
||||
T}:T{
|
||||
If set to 1, will run the older version 1 of \fBmariadb\-test\-run\&.pl\fR\&. This will affect what functionailty is available and what command line options are supported\&.
|
||||
If set to 1, will run the older version 1 of \fBmariadb\-test\-run\&.pl\fR\&. This will affect what functionality is available and what command line options are supported\&.
|
||||
T}
|
||||
T{
|
||||
MTR_MEM
|
||||
@ -1038,7 +1038,7 @@ file per source and header file\&.
|
||||
.\" gcov-src-dir option: mariadb-test-run.pl
|
||||
\fB\-\-gcov\-src\-dir\fR
|
||||
.sp
|
||||
Colllect coverage only within the given subdirectory\&. For example, if you're only developing the SQL layer,
|
||||
Collect coverage only within the given subdirectory\&. For example, if you're only developing the SQL layer,
|
||||
it makes sense to use \fB--gcov-src-dir=sql\fR\&.
|
||||
.RE
|
||||
.sp
|
||||
|
@ -146,7 +146,7 @@ sub collect_test_cases ($) {
|
||||
|
||||
if ( defined $depend_on_test_name )
|
||||
{
|
||||
mtr_verbose2("Giving $test_name same critera as $depend_on_test_name");
|
||||
mtr_verbose2("Giving $test_name same criteria as $depend_on_test_name");
|
||||
$sort_criteria{$test_name} = $sort_criteria{$depend_on_test_name};
|
||||
}
|
||||
else
|
||||
|
@ -136,7 +136,7 @@ sub envsubst {
|
||||
|
||||
if ( ! defined $ENV{$string} )
|
||||
{
|
||||
mtr_error("opt file referense \$$string that is unknown");
|
||||
mtr_error("opt file reference \$$string that is unknown");
|
||||
}
|
||||
|
||||
return $ENV{$string};
|
||||
|
@ -1296,7 +1296,7 @@ sub collect_mysqld_features () {
|
||||
}
|
||||
rmtree($tmpdir) if (!$opt_tmpdir);
|
||||
mtr_error("Could not find version of MySQL") unless $mysql_version_id;
|
||||
mtr_error("Could not find variabes list") unless $found_variable_list_start;
|
||||
mtr_error("Could not find variables list") unless $found_variable_list_start;
|
||||
|
||||
}
|
||||
|
||||
|
@ -1078,7 +1078,7 @@ The following specify which files/extra groups are read (specified before remain
|
||||
--pid-file=name Pid file used by mariadbd-safe
|
||||
--plugin-dir=name Directory for plugins
|
||||
--plugin-load=name Semicolon-separated list of plugins to load, where each
|
||||
plugin is specified as ether a plugin_name=library_file
|
||||
plugin is specified as either a plugin_name=library_file
|
||||
pair or only a library_file. If the latter case, all
|
||||
plugins from a given library_file will be loaded
|
||||
--plugin-load-add=name
|
||||
|
@ -1859,7 +1859,7 @@ sub collect_mysqld_features {
|
||||
/^([\S]+)[ \t]+(.*?)\r?$/ or die "Could not parse mysqld --help: $_\n";
|
||||
$mysqld_variables{$1}= $2;
|
||||
}
|
||||
mtr_error("Could not find variabes list") unless %mysqld_variables;
|
||||
mtr_error("Could not find variables list") unless %mysqld_variables;
|
||||
}
|
||||
|
||||
|
||||
@ -5968,7 +5968,7 @@ Options that specify ports
|
||||
set and is not "auto", it overrides build-thread.
|
||||
mtr-build-thread=# Specify unique number to calculate port number(s) from.
|
||||
build-thread=# Can be set in environment variable MTR_BUILD_THREAD.
|
||||
Set MTR_BUILD_THREAD="auto" to automatically aquire
|
||||
Set MTR_BUILD_THREAD="auto" to automatically acquire
|
||||
a build thread id that is unique to current host
|
||||
port-group-size=N Reserve groups of TCP ports of size N for each MTR thread
|
||||
|
||||
|
@ -35,7 +35,7 @@ The following suites are included:
|
||||
run: perl ./suite/engines/rr_trx/run_stress_tx_rr.pl --engine=<engine> [--duration=<nn>]
|
||||
[--threads=<nn>] [--try] [--help]
|
||||
|
||||
This test is can be run against any transactional engine. However scripts need to be modified in order
|
||||
This test can be run against any transactional engine. However scripts need to be modified in order
|
||||
to support such engines (current scripts support only InnoDB).
|
||||
In order to add support for a new engine, you will need to modify scripts as follows:
|
||||
1) cd to INSTALL_DIR/mysql-test/suite/engines/rr_trx
|
||||
|
@ -146,7 +146,7 @@ $cmd="MTR_VERSION=1 " .
|
||||
|
||||
# running the test
|
||||
print("\n Running \'rr_trx\' test with ".$opt_threads." clients\n");
|
||||
print(" for ".$opt_duration." seconds using the ".$opt_engine." storag engine.\n");
|
||||
print(" for ".$opt_duration." seconds using the ".$opt_engine." storage engine.\n");
|
||||
print("\n Log file: ".$runlog."\n");
|
||||
if ($opt_try) {
|
||||
print("\nThe following command will execute:\n");
|
||||
@ -282,7 +282,7 @@ SYNTAX $0 --engine=<engine> [--duration=<nn>] [--thread=<nn>] [--try]
|
||||
|
||||
--engine=<engine>
|
||||
The engine used to run the test. \<engine\> needs to be provided exactly as
|
||||
it is reprted in the SHOW ENGINES comand.
|
||||
it is reported in the SHOW ENGINES command.
|
||||
EXCEPTION: In order to use the InnoDB plugin, specify 'InnoDB_plugin'
|
||||
Required option.
|
||||
|
||||
@ -308,12 +308,12 @@ sub add_engine_help
|
||||
{
|
||||
print <<EOF;
|
||||
|
||||
\nThis test is can be run against any transactional engine. However scripts need to be modifed in order
|
||||
\nThis test can be run against any transactional engine. However scripts need to be modified in order
|
||||
to support such engines (support to InnoDB is provided as an example).
|
||||
In order to add support for a new engine, you will need to modify scripts as follows:
|
||||
1) cd to INSTALL_DIR/mysql-test/suite/engines/rr_trx
|
||||
2) Modify the 'run_stress_rr.pl' file by adding an 'elsif' section for your engine and have it
|
||||
include specifc values required to be passed as startup parameters to the MySQL server by
|
||||
include specific values required to be passed as startup parameters to the MySQL server by
|
||||
specifying them using "--mysqld" options (see InnoDB example).
|
||||
3) Copy the 'init_innodb.txt' file to 'init_<engine>.txt file and change its content to be "init_<engine>".
|
||||
4) In the 't' directory copy the "init_innodb.test" file to "init_\<engine\>.test" and change the value of
|
||||
|
@ -380,7 +380,7 @@ sub database {
|
||||
} else {
|
||||
print "Type either database name or * meaning any databasename. That means";
|
||||
print " any of those above but also any which will be created in future!";
|
||||
print " This option gives a user chance to operate on databse mysql, which";
|
||||
print " This option gives user a chance to operate on database mysql, which";
|
||||
print " contains privilege settings. That is really risky!\n";
|
||||
next;
|
||||
}
|
||||
|
@ -1949,13 +1949,13 @@ sub PrintHelp()
|
||||
E - display current replication error
|
||||
f - show full query info for a given thread
|
||||
F - unfilter the display
|
||||
h - show only a specifc host's connections
|
||||
h - show only a specific host's connections
|
||||
H - toggle the mytop header
|
||||
i - toggle the display of idle (sleeping) threads
|
||||
I - show innodb status
|
||||
k - kill a thread
|
||||
p - pause the display
|
||||
l - change long running queries hightlighing
|
||||
l - change long running queries highlighting
|
||||
m - switch [mode] to qps (queries/sec) scrolling view
|
||||
M - switch [mode] to status
|
||||
o - reverse the sort order (toggle)
|
||||
@ -1963,7 +1963,7 @@ sub PrintHelp()
|
||||
r - reset the status counters (via FLUSH STATUS on your server)
|
||||
R - change reverse IP lookup
|
||||
s - change the delay between screen updates
|
||||
S - change slow query hightlighting
|
||||
S - change slow query highlighting
|
||||
t - switch to thread view (default)
|
||||
u - show only a specific user
|
||||
V - show variables
|
||||
|
@ -1442,7 +1442,7 @@ verify_ca_matches_cert()
|
||||
wsrep_log_info "run: \"$OPENSSL_BINARY\" verify -verbose${ca:+ -CAfile \"$ca\"}${cap:+ -CApath \"$cap\"} \"$cert\""
|
||||
wsrep_log_info "output: $errmsg"
|
||||
wsrep_log_error "******** FATAL ERROR ********************************************"
|
||||
wsrep_log_error "* The certifcate and CA (certificate authority) do not match. *"
|
||||
wsrep_log_error "* The certificate and CA (certificate authority) do not match. *"
|
||||
wsrep_log_error "* It does not appear that the certificate was issued by the CA. *"
|
||||
wsrep_log_error "* Please check your certificate and CA files. *"
|
||||
wsrep_log_error "*****************************************************************"
|
||||
|
@ -276,7 +276,7 @@ sub odbc_to_sql
|
||||
return "tinyint" if (!defined($precision));
|
||||
return "tinyint($precision)";
|
||||
}
|
||||
die "Can't covert type '$type' to a ODBC type\n";
|
||||
die "Can't convert type '$type' to a ODBC type\n";
|
||||
}
|
||||
|
||||
#
|
||||
|
@ -2784,7 +2784,7 @@ if (!defined($limits{$key}))
|
||||
save_config_data($key,$limit,$prompt);
|
||||
|
||||
} else {
|
||||
print "$prompt=$limits{$key} (cashed)\n";
|
||||
print "$prompt=$limits{$key} (cached)\n";
|
||||
}
|
||||
|
||||
|
||||
|
@ -2382,7 +2382,7 @@ sub vacuum
|
||||
$loop_time=new Benchmark;
|
||||
my (@tables,$sth,$current_table,$current_base);
|
||||
$dbh->do("dump tran $database with truncate_only");
|
||||
$sth=$dbh->prepare("sp_tables" ) or die "prepere";
|
||||
$sth=$dbh->prepare("sp_tables" ) or die "prepare";
|
||||
$sth->execute() or die "execute";
|
||||
while (@row = $sth->fetchrow_array()) {
|
||||
$current_table = $row[2];
|
||||
|
@ -258,7 +258,7 @@ print "Time to select_2_rows ($opt_loop_count): " .
|
||||
|
||||
if ($limits->{'functions'})
|
||||
{
|
||||
print "Test select with aritmetic (+)\n";
|
||||
print "Test select with arithmetic (+)\n";
|
||||
$loop_time=new Benchmark;
|
||||
|
||||
for ($i=0; $i < $opt_loop_count; $i++)
|
||||
|
@ -6987,7 +6987,7 @@ struct my_option my_long_options[]=
|
||||
OPT_ARG, 0, 0, 0, 0, 0, 0},
|
||||
{"plugin-load", OPT_PLUGIN_LOAD,
|
||||
"Semicolon-separated list of plugins to load, where each plugin is "
|
||||
"specified as ether a plugin_name=library_file pair or only a library_file. "
|
||||
"specified as either a plugin_name=library_file pair or only a library_file. "
|
||||
"If the latter case, all plugins from a given library_file will be loaded",
|
||||
0, 0, 0,
|
||||
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
|
||||
|
@ -9610,7 +9610,7 @@ ha_innobase::ft_init_ext(
|
||||
switch (trx->state) {
|
||||
default:
|
||||
ut_ad("invalid state" == 0);
|
||||
my_printf_error(HA_ERR_ROLLBACK, "Invalid tansaction state",
|
||||
my_printf_error(HA_ERR_ROLLBACK, "Invalid transaction state",
|
||||
ME_ERROR_LOG);
|
||||
return nullptr;
|
||||
case TRX_STATE_ACTIVE:
|
||||
|
@ -397,7 +397,7 @@ ut_strerr(
|
||||
case DB_TEMP_FILE_WRITE_FAIL:
|
||||
return("Temp file write failure");
|
||||
case DB_CANT_CREATE_GEOMETRY_OBJECT:
|
||||
return("Can't create specificed geometry data object");
|
||||
return("Can't create specified geometry data object");
|
||||
case DB_CANNOT_OPEN_FILE:
|
||||
return("Cannot open a file");
|
||||
case DB_TABLE_CORRUPT:
|
||||
|
2
storage/mroonga/vendor/groonga/lib/nfkc.rb
vendored
2
storage/mroonga/vendor/groonga/lib/nfkc.rb
vendored
@ -789,7 +789,7 @@ def create_compose_map(decompose_map)
|
||||
src = src.chars.collect{|c| decompose_map[c] || c}.join
|
||||
dst = decompose_map[dst] || dst
|
||||
if cc[src] && cc[src] != dst
|
||||
STDERR.puts("caution: inconsitent mapping '#{src}' => '#{cc[src]}'|'#{dst}'")
|
||||
STDERR.puts("caution: inconsistent mapping '#{src}' => '#{cc[src]}'|'#{dst}'")
|
||||
end
|
||||
cc[src] = dst if src != dst
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user