diff options
| -rw-r--r-- | man/mysqldump.1 | 2 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 12 | ||||
| -rw-r--r-- | sql/log.cc | 2 | ||||
| -rw-r--r-- | sql/rpl_rli.h | 2 | ||||
| -rw-r--r-- | storage/maria/maria_chk.c | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/man/mysqldump.1 b/man/mysqldump.1 index da2e4fa02c5..be5b855e3fa 100644 --- a/man/mysqldump.1 +++ b/man/mysqldump.1 @@ -1275,7 +1275,7 @@ to point the slave to the correct master server host\&. Add any such parameters .\" max-allowed-packet option: mysqldump \fB\-\-max\-allowed\-packet=\fR\fB\fIlength\fR\fR .sp -Sets the maximum packet length to send to or recieve from server\&. +Sets the maximum packet length to send to or receive from server\&. .RE .sp .RS 4 diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 8b4a48f60c1..9158a70d9cc 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -837,7 +837,7 @@ sub run_test_server ($$$) { redo; } - # Limit number of parallell NDB tests + # Limit number of parallel NDB tests if ($t->{ndb_test} and $num_ndb_tests >= $max_ndb){ #mtr_report("Skipping, num ndb is already at max, $num_ndb_tests"); next; @@ -6411,10 +6411,10 @@ Options to control what engine/variation to run: non-blocking-api Use the non-blocking client API compress Use the compressed protocol between client and server ssl Use ssl protocol between client and server - skip-ssl Dont start server with support for ssl connections + skip-ssl Don't start server with support for ssl connections vs-config Visual Studio configuration used to create executables (default: MTR_VS_CONFIG environment variable) - parallel=# How many parallell test should be run + parallel=# How many parallel test should be run defaults-file=<config template> Use fixed config template for all tests defaults-extra-file=<config template> Extra config template to add to @@ -6543,7 +6543,7 @@ Options for debugging the product up disks for heavily crashing server). Defaults to $opt_max_save_datadir, set to 0 for no limit. Set it's default with MTR_MAX_SAVE_DATADIR - max-test-fail Limit the number of test failurs before aborting + max-test-fail Limit the number of test failures before aborting the current test run. Defaults to $opt_max_test_fail, set to 0 for no limit. Set it's default with MTR_MAX_TEST_FAIL @@ -6590,7 +6590,7 @@ Misc options --mysqld (if any) wait-all If --start or --start-dirty option is used, wait for all servers to exit before finishing the process - fast Run as fast as possible, dont't wait for servers + fast Run as fast as possible, don't wait for servers to shutdown etc. force-restart Always restart servers between tests parallel=N Run tests in N parallel threads (default 1) @@ -6625,7 +6625,7 @@ Misc options actions. Disable facility with NUM=0. gcov Collect coverage information after the test. The result is a gcov file per source and header file. - gcov-src-dir=subdir Colllect coverage only within the given subdirectory. + gcov-src-dir=subdir Collect coverage only within the given subdirectory. For example, if you're only developing the SQL layer, it makes sense to use --gcov-src-dir=sql gprof Collect profiling information using gprof. diff --git a/sql/log.cc b/sql/log.cc index d9899267068..2310d6aeed8 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -3291,7 +3291,7 @@ bool MYSQL_BIN_LOG::open(const char *log_name, it may be good to consider what actually happens when open_purge_index_file succeeds but register or sync fails. - Perhaps we might need the code below in MYSQL_LOG_BIN::cleanup + Perhaps we might need the code below in MYSQL_BIN_LOG::cleanup for "real life" purposes as well? */ DBUG_EXECUTE_IF("fault_injection_registering_index", { diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h index d6ff96e2368..efcec83b880 100644 --- a/sql/rpl_rli.h +++ b/sql/rpl_rli.h @@ -715,7 +715,7 @@ struct rpl_group_info /** Save pointer to Annotate_rows event and switch on the binlog_annotate_row_events for this sql thread. - To be called when sql thread recieves an Annotate_rows event. + To be called when sql thread receives an Annotate_rows event. */ inline void set_annotate_event(Annotate_rows_log_event *event) { diff --git a/storage/maria/maria_chk.c b/storage/maria/maria_chk.c index 2ea647ea1f5..c9d38400bc4 100644 --- a/storage/maria/maria_chk.c +++ b/storage/maria/maria_chk.c @@ -1054,7 +1054,7 @@ static int maria_chk(HA_CHECK *param, char *filename) error= 1; goto end2; } - /* We can't do parallell repair with BLOCK_RECORD yet */ + /* We can't do parallel repair with BLOCK_RECORD yet */ if (param->testflag & T_REP_PARALLEL) { param->testflag&= ~T_REP_PARALLEL; |