From 1b95e46524c3aea81aba79f9082eca584995fb34 Mon Sep 17 00:00:00 2001 From: Vasilii Lakhin Date: Mon, 7 Apr 2025 20:13:58 +0300 Subject: [PATCH] Fix typos in mysql-test/ --- mysql-test/include/check-testcase.inc | 4 ++-- mysql-test/include/common-tests.inc | 4 ++-- mysql-test/include/concurrent.inc | 6 +++--- mysql-test/include/ctype_unescape.inc | 2 +- mysql-test/include/default_mysqld.cnf | 2 +- mysql-test/include/execute_with_statistics.inc | 6 +++--- mysql-test/include/index_merge_ror.inc | 2 +- mysql-test/include/mix2.inc | 4 ++-- mysql-test/include/plugin.defs | 2 +- mysql-test/include/sync_io_with_master.inc | 2 +- mysql-test/lib/My/Config.pm | 2 +- mysql-test/lib/My/ConfigFactory.pm | 2 +- mysql-test/lib/My/CoreDump.pm | 4 ++-- mysql-test/lib/My/Platform.pm | 2 +- mysql-test/lib/My/SafeProcess.pm | 4 ++-- mysql-test/lib/My/SafeProcess/Base.pm | 2 +- mysql-test/lib/My/SafeProcess/safe_process.cc | 2 +- .../lib/My/SafeProcess/safe_process_win.cc | 6 +++--- mysql-test/lib/My/SysInfo.pm | 2 +- mysql-test/lib/mtr_cases.pm | 6 +++--- mysql-test/lib/v1/mtr_cases.pl | 9 ++++----- mysql-test/lib/v1/mtr_process.pl | 12 ++++++------ mysql-test/lib/v1/mtr_report.pl | 2 +- mysql-test/lib/v1/mysql-test-run.pl | 16 ++++++++-------- mysql-test/main/alter_table-big.test | 2 +- mysql-test/main/alter_table.result | 2 +- mysql-test/main/alter_table.test | 2 +- mysql-test/main/analyze_format_json.test | 2 +- mysql-test/main/auto_increment.test | 2 +- mysql-test/main/bigint.test | 2 +- mysql-test/main/case.test | 2 +- mysql-test/main/column_compression.test | 2 +- mysql-test/main/comments.result | 2 +- mysql-test/main/comments.test | 2 +- mysql-test/main/commit.test | 4 ++-- mysql-test/main/compare.test | 2 +- .../main/concurrent_innodb_safelog.result | 2 +- .../main/concurrent_innodb_unsafelog.result | 2 +- mysql-test/main/costs.result | 2 +- mysql-test/main/costs.test | 2 +- mysql-test/main/create-big.test | 2 +- mysql-test/main/create.test | 6 +++--- mysql-test/main/create_drop_db.test | 2 +- mysql-test/main/create_w_max_indexes_64.test | 2 +- mysql-test/main/cset_narrowing.result | 2 +- mysql-test/main/cset_narrowing.test | 2 +- mysql-test/main/cte_nonrecursive.result | 4 ++-- mysql-test/main/cte_nonrecursive.test | 4 ++-- mysql-test/main/cte_recursive.test | 4 ++-- mysql-test/main/ctype_latin1.test | 2 +- mysql-test/main/ctype_recoding.test | 6 +++--- mysql-test/main/ctype_utf16.test | 2 +- mysql-test/main/ctype_utf16le.result | 2 +- mysql-test/main/ctype_utf16le.test | 2 +- mysql-test/main/ctype_utf32.result | 2 +- mysql-test/main/ctype_utf32.test | 4 ++-- mysql-test/main/ctype_utf8.test | 2 +- .../main/custom_aggregate_functions.test | 2 +- mysql-test/main/custom_aggregates_i_s.result | 2 +- mysql-test/main/custom_aggregates_i_s.test | 2 +- mysql-test/main/default.result | 4 ++-- mysql-test/main/default.test | 6 +++--- mysql-test/main/delete.result | 4 ++-- mysql-test/main/delete.test | 4 ++-- mysql-test/main/delete_use_source.result | 2 +- mysql-test/main/delete_use_source.test | 2 +- mysql-test/main/derived_split_innodb.test | 2 +- mysql-test/main/distinct.test | 2 +- mysql-test/main/drop_table_force.test | 4 ++-- mysql-test/main/failed_auth_3909.test | 2 +- mysql-test/main/flush.test | 2 +- mysql-test/main/flush_read_lock.result | 8 ++++---- mysql-test/main/flush_read_lock.test | 8 ++++---- mysql-test/main/flush_ssl.test | 2 +- mysql-test/main/func_encrypt_nossl.test | 2 +- mysql-test/main/func_group.result | 2 +- mysql-test/main/func_group.test | 4 ++-- mysql-test/main/func_hybrid_type.result | 2 +- mysql-test/main/func_hybrid_type.test | 2 +- mysql-test/main/func_json.result | 2 +- mysql-test/main/func_json.test | 2 +- mysql-test/main/func_regexp_pcre.result | 4 ++-- mysql-test/main/func_regexp_pcre.test | 6 +++--- mysql-test/main/func_str.test | 8 ++++---- mysql-test/main/func_time.result | 2 +- mysql-test/main/func_time.test | 4 ++-- mysql-test/main/gis.test | 2 +- mysql-test/main/grant.test | 4 ++-- mysql-test/main/grant_slave_monitor.test | 4 ++-- mysql-test/main/greedy_optimizer.result | 2 +- mysql-test/main/greedy_optimizer.test | 6 +++--- mysql-test/main/group_min_max.result | 2 +- mysql-test/main/group_min_max.test | 2 +- mysql-test/main/having_cond_pushdown.result | 2 +- mysql-test/main/having_cond_pushdown.test | 2 +- .../main/host_cache_size_functionality.test | 4 ++-- mysql-test/main/information_schema_chmod.test | 2 +- mysql-test/main/information_schema_db.test | 2 +- .../main/information_schema_tables.result | 2 +- mysql-test/main/information_schema_tables.test | 4 ++-- .../main/information_schema_temp_table.test | 2 +- mysql-test/main/innodb_ext_key.result | 2 +- mysql-test/main/innodb_ext_key.test | 2 +- mysql-test/main/innodb_mrr_cpk.test | 2 +- mysql-test/main/insert.test | 2 +- mysql-test/main/insert_select.test | 4 ++-- mysql-test/main/insert_update.test | 2 +- mysql-test/main/join.test | 2 +- mysql-test/main/join_cache.result | 2 +- mysql-test/main/join_cache.test | 4 ++-- mysql-test/main/join_cache_notasan.test | 2 +- mysql-test/main/join_outer.result | 2 +- mysql-test/main/join_outer.test | 6 +++--- mysql-test/main/join_outer_jcl6.result | 2 +- mysql-test/main/loaddata.test | 4 ++-- mysql-test/main/lock.result | 2 +- mysql-test/main/lock.test | 2 +- mysql-test/main/lock_sync.test | 2 +- mysql-test/main/log_tables.test | 4 ++-- mysql-test/main/long_unique_bugs.result | 2 +- mysql-test/main/long_unique_bugs.test | 2 +- .../main/long_unique_bugs_replication.test | 2 +- mysql-test/main/lowercase_fs_on.test | 2 +- .../main/master_retry_count_basic.result | 2 +- mysql-test/main/master_retry_count_basic.test | 2 +- mysql-test/main/mdev-34724.result | 2 +- mysql-test/main/mdev-34724.test | 2 +- mysql-test/main/mdl_sync.result | 6 +++--- mysql-test/main/mdl_sync.test | 6 +++--- mysql-test/main/multi_update_binlog.test | 2 +- mysql-test/main/myisampack.test | 4 ++-- mysql-test/main/mysql.test | 2 +- mysql-test/main/mysql_upgrade_to_100502.result | 4 ++-- mysql-test/main/mysql_upgrade_to_100502.test | 4 ++-- mysql-test/main/mysqlbinlog.test | 4 ++-- mysql-test/main/mysqldump.result | 2 +- mysql-test/main/mysqldump.test | 2 +- mysql-test/main/mysqltest.test | 2 +- mysql-test/main/named_pipe.test | 2 +- mysql-test/main/natural_sort_key.test | 2 +- mysql-test/main/odbc.test | 2 +- mysql-test/main/olap.test | 2 +- mysql-test/main/opt_trace.result | 2 +- mysql-test/main/opt_trace.test | 2 +- mysql-test/main/opt_tvc.result | 2 +- mysql-test/main/opt_tvc.test | 2 +- mysql-test/main/parser.result | 4 ++-- mysql-test/main/parser.test | 4 ++-- mysql-test/main/partition.test | 2 +- mysql-test/main/partition_column.result | 2 +- mysql-test/main/partition_column.test | 2 +- mysql-test/main/partition_datatype.result | 2 +- mysql-test/main/partition_datatype.test | 2 +- mysql-test/main/partition_default.test | 2 +- mysql-test/main/partition_exchange.test | 2 +- .../main/partition_explicit_prune.result | 4 ++-- mysql-test/main/partition_explicit_prune.test | 4 ++-- mysql-test/main/partition_hash.test | 2 +- mysql-test/main/partition_key_cache.result | 2 +- mysql-test/main/partition_key_cache.test | 2 +- mysql-test/main/partition_myisam.test | 2 +- mysql-test/main/partition_pruning.test | 2 +- .../main/partition_rename_longfilename.test | 2 +- mysql-test/main/plugin.test | 2 +- mysql-test/main/plugin_auth.result | 6 +++--- mysql-test/main/plugin_auth.test | 8 ++++---- mysql-test/main/precedence.test | 2 +- mysql-test/main/ps.test | 2 +- mysql-test/main/ps_11bugs.test | 2 +- mysql-test/main/ps_ddl.result | 2 +- mysql-test/main/ps_ddl.test | 2 +- mysql-test/main/ps_mem_leaks.result | 2 +- mysql-test/main/ps_mem_leaks.test | 4 ++-- mysql-test/main/ps_missed_cmds.result | 4 ++-- mysql-test/main/ps_missed_cmds.test | 4 ++-- mysql-test/main/ps_missed_cmds_bin_prot.result | 2 +- mysql-test/main/ps_missed_cmds_bin_prot.test | 2 +- ...ps_missed_cmds_bin_prot_not_embedded.result | 2 +- .../ps_missed_cmds_bin_prot_not_embedded.test | 2 +- .../main/ps_missed_cmds_not_embedded.result | 2 +- .../main/ps_missed_cmds_not_embedded.test | 2 +- mysql-test/main/ps_show_log.result | 2 +- mysql-test/main/ps_show_log.test | 2 +- mysql-test/main/query_cache.test | 2 +- mysql-test/main/query_cache_with_views.test | 2 +- mysql-test/main/range.result | 2 +- mysql-test/main/range.test | 4 ++-- mysql-test/main/range_mrr_icp.result | 2 +- mysql-test/main/range_vs_index_merge.test | 2 +- mysql-test/main/rename.test | 2 +- mysql-test/main/repair.test | 2 +- mysql-test/main/replace_returning_err.test | 4 ++-- mysql-test/main/row.test | 2 +- mysql-test/main/rownum.test | 2 +- mysql-test/main/select.test | 8 ++++---- mysql-test/main/session_user.result | 2 +- mysql-test/main/session_user.test | 2 +- mysql-test/main/set_statement.test | 2 +- mysql-test/main/show_check.test | 2 +- mysql-test/main/signal.result | 2 +- mysql-test/main/signal.test | 2 +- mysql-test/main/sp-anchor-type.test | 2 +- mysql-test/main/sp-code.test | 2 +- mysql-test/main/sp-destruct.test | 2 +- mysql-test/main/sp-dynamic.test | 2 +- mysql-test/main/sp-error.test | 4 ++-- mysql-test/main/sp-lock.result | 2 +- mysql-test/main/sp-lock.test | 2 +- mysql-test/main/sp-package.test | 2 +- mysql-test/main/sp-security-debug.test | 2 +- mysql-test/main/sp-vars.test | 2 +- mysql-test/main/sp.result | 6 +++--- mysql-test/main/sp.test | 12 ++++++------ mysql-test/main/sp_trans.test | 2 +- mysql-test/main/sp_validation.result | 2 +- mysql-test/main/sp_validation.test | 2 +- mysql-test/main/ssl_cipher.test | 2 +- mysql-test/main/statistics.result | 4 ++-- mysql-test/main/statistics.test | 4 ++-- mysql-test/main/statistics_json.result | 4 ++-- mysql-test/main/status.test | 2 +- mysql-test/main/strict.test | 2 +- mysql-test/main/subselect.test | 10 +++++----- mysql-test/main/subselect4.result | 4 ++-- mysql-test/main/subselect4.test | 4 ++-- mysql-test/main/subselect_cache.test | 4 ++-- mysql-test/main/subselect_gis.test | 2 +- mysql-test/main/subselect_mat_cost.test | 2 +- mysql-test/main/subselect_mat_cost_bugs.result | 2 +- mysql-test/main/subselect_mat_cost_bugs.test | 2 +- mysql-test/main/subselect_partial_match.result | 6 +++--- mysql-test/main/subselect_partial_match.test | 6 +++--- mysql-test/main/subselect_sj2_mat.result | 2 +- mysql-test/main/subselect_sj2_mat.test | 2 +- mysql-test/main/subselect_sj_nonmerged.test | 2 +- mysql-test/main/sysdate_is_now.test | 2 +- mysql-test/main/table_options.result | 2 +- mysql-test/main/table_options.test | 2 +- mysql-test/main/tc_heuristic_recover.test | 2 +- mysql-test/main/timezone2.test | 6 +++--- mysql-test/main/tmp_space_usage.test | 2 +- mysql-test/main/trigger-compat.result | 2 +- mysql-test/main/trigger-compat.test | 2 +- mysql-test/main/trigger.test | 4 ++-- mysql-test/main/trigger_notembedded.test | 8 ++++---- mysql-test/main/trigger_wl3253.result | 4 ++-- mysql-test/main/trigger_wl3253.test | 4 ++-- mysql-test/main/type_datetime.test | 2 +- mysql-test/main/type_float.result | 2 +- mysql-test/main/type_float.test | 2 +- mysql-test/main/type_newdecimal.test | 4 ++-- mysql-test/main/type_timestamp.test | 4 ++-- mysql-test/main/udf.test | 2 +- mysql-test/main/union.result | 2 +- mysql-test/main/union.test | 2 +- mysql-test/main/user_limits.test | 2 +- mysql-test/main/user_var.test | 2 +- mysql-test/main/view.test | 10 +++++----- mysql-test/main/view_alias.result | 2 +- mysql-test/main/view_alias.test | 2 +- mysql-test/main/view_grant.test | 4 ++-- mysql-test/main/win.result | 2 +- mysql-test/main/win.test | 4 ++-- mysql-test/main/xml.test | 2 +- mysql-test/main/xtradb_mrr.result | 2 +- mysql-test/main/xtradb_mrr.test | 2 +- mysql-test/mariadb-stress-test.pl | 16 ++++++++-------- mysql-test/mariadb-test-run.pl | 12 ++++++------ mysql-test/std_data/loadxml.dat | 2 +- mysql-test/std_data/wsrep_notify.sh | 2 +- mysql-test/std_data/wsrep_notify_ssl.sh | 2 +- .../binlog/include/binlog_row_annotate.inc | 2 +- .../include/mix_innodb_myisam_binlog.test | 6 +++--- .../binlog/include/print_optional_metadata.inc | 2 +- mysql-test/suite/binlog/include/row_img.test | 2 +- mysql-test/suite/binlog/r/binlog_grant.result | 2 +- .../suite/binlog/r/binlog_rotate_perf.result | 2 +- .../binlog_table_map_optional_metadata.result | 2 +- mysql-test/suite/binlog/r/flashback.result | 2 +- .../suite/binlog/t/binlog_checkpoint.test | 2 +- .../suite/binlog/t/binlog_commit_wait.test | 8 ++++---- mysql-test/suite/binlog/t/binlog_database.test | 2 +- .../binlog/t/binlog_empty_xa_prepared.test | 2 +- .../t/binlog_flush_binlogs_delete_domain.test | 2 +- .../t/binlog_format_switch_in_tmp_table.test | 2 +- mysql-test/suite/binlog/t/binlog_grant.test | 2 +- mysql-test/suite/binlog/t/binlog_killed.test | 2 +- .../binlog_mysqlbinlog_suppress_O_TMPFILE.test | 2 +- .../binlog/t/binlog_no_uniqfile_crash.test | 4 ++-- .../suite/binlog/t/binlog_rotate_perf.test | 2 +- .../t/binlog_row_mysqlbinlog_db_filter.test | 2 +- .../t/binlog_table_map_optional_metadata.test | 2 +- .../suite/binlog/t/binlog_tmp_table.test | 2 +- .../binlog/t/binlog_truncate_multi_log.test | 2 +- .../suite/binlog/t/binlog_xa_handling.test | 2 +- mysql-test/suite/binlog/t/flashback.test | 2 +- .../t/innodb_rc_insert_before_delete.test | 2 +- ...ed_master_switch_to_unencrypted_coords.test | 2 +- .../suite/binlog_encryption/rpl_sync.result | 2 +- .../suite/client/client-env-variable.test | 4 ++-- .../suite/compat/oracle/r/exception.result | 2 +- .../suite/compat/oracle/r/sp-cursor.result | 2 +- .../suite/compat/oracle/r/sp-goto.result | 2 +- mysql-test/suite/compat/oracle/r/sp.result | 2 +- .../oracle/t/binlog_ptr_mysqlbinlog.test | 2 +- .../suite/compat/oracle/t/exception.test | 2 +- mysql-test/suite/compat/oracle/t/parser.test | 2 +- .../suite/compat/oracle/t/sp-cursor.test | 2 +- mysql-test/suite/compat/oracle/t/sp-goto.test | 2 +- mysql-test/suite/compat/oracle/t/sp.test | 2 +- mysql-test/suite/csv/csv.test | 2 +- .../encryption/r/tempfiles_encrypted.result | 2 +- mysql-test/suite/encryption/t/aria_tiny.test | 2 +- .../t/innodb_encryption-page-compression.test | 2 +- mysql-test/suite/engines/funcs/r/rpl_sp.result | 2 +- .../engines/funcs/t/rpl_stm_mystery22.test | 2 +- .../suite/engines/iuds/t/insert_calendar.test | 2 +- .../suite/engines/rr_trx/include/rr_init.test | 4 ++-- .../suite/engines/rr_trx/run_stress_tx_rr.pl | 2 +- .../suite/engines/rr_trx/t/rr_i_40-44.test | 10 +++++----- .../suite/engines/rr_trx/t/rr_id_900.test | 4 ++-- .../engines/rr_trx/t/rr_insert_select_2.test | 2 +- .../suite/engines/rr_trx/t/rr_u_10-19.test | 2 +- .../engines/rr_trx/t/rr_u_10-19_nolimit.test | 2 +- mysql-test/suite/events/events_bugs.test | 4 ++-- .../suite/federated/federated_server.test | 2 +- mysql-test/suite/federated/federatedx.test | 2 +- mysql-test/suite/funcs_1/datadict/columns.inc | 2 +- mysql-test/suite/funcs_1/datadict/datadict.pre | 2 +- .../suite/funcs_1/datadict/datadict_load.inc | 2 +- mysql-test/suite/funcs_1/lib/DataGen_modify.pl | 2 +- .../suite/funcs_1/storedproc/storedproc_02.inc | 2 +- .../suite/funcs_1/t/is_table_constraints.test | 4 ++-- mysql-test/suite/funcs_1/t/storedproc.test | 2 +- .../suite/funcs_1/triggers/trig_frkey.inc | 2 +- .../suite/funcs_1/triggers/triggers_0102.inc | 2 +- .../suite/funcs_1/triggers/triggers_09.inc | 2 +- mysql-test/suite/galera/r/MDEV-20616.result | 2 +- .../suite/galera/r/mysql-wsrep-bugs-607.result | 2 +- mysql-test/suite/galera/t/MDEV-20616.test | 4 ++-- mysql-test/suite/galera/t/MW-286.test | 2 +- mysql-test/suite/galera/t/MW-369.test | 4 ++-- .../t/galera_FK_duplicate_client_insert.test | 2 +- .../suite/galera/t/galera_UK_conflict.test | 4 ++-- mysql-test/suite/galera/t/galera_bf_kill.test | 4 ++-- .../suite/galera/t/galera_nonPK_and_PA.test | 8 ++++---- .../t/galera_query_cache_invalidate.test | 2 +- .../suite/galera/t/galera_restart_replica.test | 2 +- .../suite/galera/t/galera_slave_replay.test | 2 +- .../galera/t/galera_sql_log_bin_zero.test | 2 +- .../suite/galera/t/galera_ssl_cipher.test | 2 +- ...st_mariabackup_encrypt_with_key_server.test | 2 +- .../galera/t/galera_table_with_hyphen.test | 2 +- .../suite/galera/t/galera_toi_ddl_locking.test | 2 +- .../galera/t/galera_toi_drop_database.test | 2 +- .../suite/galera/t/galera_var_max_ws_rows.test | 2 +- .../galera/t/galera_var_wsrep_on_off.test | 2 +- .../suite/galera/t/galera_virtual_column.test | 2 +- .../suite/galera/t/mysql-wsrep-bugs-607.test | 2 +- .../t/wsrep_mode_strict_replication.test | 2 +- .../galera_3nodes/t/galera-features#119.test | 2 +- .../galera_3nodes/t/galera_gtid_2_cluster.test | 4 ++-- .../t/galera_gtid_consistency.test | 4 ++-- .../t/galera_ist_gcache_rollover.test | 2 +- .../galera_3nodes/t/galera_join_with_cc_B.test | 2 +- .../galera_3nodes/t/galera_join_with_cc_C.test | 4 ++-- .../galera_3nodes/t/galera_pc_weight.test | 4 ++-- .../t/inconsistency_shutdown.test | 4 ++-- mysql-test/suite/galera_sr/t/MDEV-34836.test | 2 +- .../t/galera_sr_conflict_on_commit2.test | 2 +- .../galera_sr/t/galera_sr_fk_conflict.test | 2 +- .../galera_sr/t/galera_sr_nonPK_and_PA.test | 4 ++-- .../suite/galera_sr/t/galera_sr_ws_size.test | 2 +- .../suite/galera_sr/t/mysql-wsrep#215.test | 2 +- .../gcol/inc/gcol_dependancies_on_vcol.inc | 2 +- .../suite/gcol/t/innodb_virtual_index.test | 4 ++-- mysql-test/suite/handler/aria.result | 2 +- mysql-test/suite/handler/handler.inc | 2 +- mysql-test/suite/handler/heap.result | 2 +- mysql-test/suite/handler/innodb.result | 2 +- mysql-test/suite/handler/myisam.result | 2 +- .../r/avoid_deadlock_with_blocked.result | 4 ++-- .../suite/innodb/r/innodb-autoinc.result | 2 +- .../innodb/r/innodb_lock_wait_timeout_1.result | 2 +- mysql-test/suite/innodb/r/innodb_mysql.result | 2 +- .../innodb/t/avoid_deadlock_with_blocked.test | 4 ++-- .../suite/innodb/t/cursor-restore-locking.test | 4 ++-- .../innodb/t/deadlock_in_subqueries_join.test | 2 +- .../innodb/t/deadlock_on_lock_upgrade.test | 2 +- .../suite/innodb/t/deadlock_victim_race.test | 2 +- .../innodb/t/deadlock_wait_lock_race.test | 2 +- .../suite/innodb/t/deadlock_wait_thr_race.test | 2 +- .../t/default_row_format_compatibility.test | 2 +- .../suite/innodb/t/index_merge_threshold.test | 2 +- mysql-test/suite/innodb/t/innodb-autoinc.test | 4 ++-- .../suite/innodb/t/innodb-fk-warnings.test | 2 +- mysql-test/suite/innodb/t/innodb-wl5522-1.test | 12 ++++++------ mysql-test/suite/innodb/t/innodb.test | 4 ++-- mysql-test/suite/innodb/t/innodb_bug42419.test | 2 +- mysql-test/suite/innodb/t/innodb_bug53592.test | 2 +- .../innodb_bulk_create_index_replication.test | 2 +- .../innodb/t/innodb_lock_wait_timeout_1.test | 2 +- mysql-test/suite/innodb/t/innodb_mysql.test | 2 +- .../innodb/t/lock_move_wait_lock_race.test | 2 +- mysql-test/suite/innodb/t/log_file_name.test | 2 +- .../innodb/t/mon_lock_wait_current_count.test | 2 +- .../suite/innodb/t/skip_locked_nowait.test | 2 +- .../suite/innodb/t/temp_table_savepoint.test | 4 ++-- .../r/innodb_fts_stopword_charset.result | 2 +- .../suite/innodb_fts/r/sync_block.result | 4 ++-- .../t/fts_sync_commit_resiliency.test | 2 +- .../suite/innodb_fts/t/fulltext_order_by.test | 2 +- .../suite/innodb_fts/t/innodb_fts_misc_1.test | 6 +++--- .../innodb_fts/t/innodb_fts_proximity.test | 4 ++-- .../t/innodb_fts_stopword_charset.test | 2 +- .../innodb_fts/t/innodb_fts_transaction.test | 10 +++++----- mysql-test/suite/innodb_fts/t/misc_1.test | 6 +++--- mysql-test/suite/innodb_fts/t/misc_debug.test | 2 +- .../suite/innodb_fts/t/multiple_index.test | 2 +- mysql-test/suite/innodb_fts/t/opt.test | 2 +- mysql-test/suite/innodb_fts/t/stopword.test | 16 ++++++++-------- mysql-test/suite/innodb_fts/t/sync_block.test | 4 ++-- mysql-test/suite/innodb_gis/r/geometry.result | 6 +++--- .../suite/innodb_gis/r/gis_split_nan.result | 2 +- mysql-test/suite/innodb_gis/t/1.test | 6 +++--- .../innodb_gis/t/alter_spatial_index.test | 4 ++-- mysql-test/suite/innodb_gis/t/bug17057168.test | 2 +- mysql-test/suite/innodb_gis/t/geometry.test | 8 ++++---- .../suite/innodb_gis/t/gis_split_nan.test | 2 +- .../suite/innodb_gis/t/repeatable_spatial.test | 2 +- mysql-test/suite/innodb_gis/t/rt_precise.test | 2 +- mysql-test/suite/innodb_gis/t/rtree_split.test | 2 +- .../suite/innodb_zip/t/innochecksum_2.test | 2 +- .../suite/innodb_zip/t/innochecksum_3.test | 6 +++--- .../innodb_zip/t/prefix_index_liftedlimit.test | 6 +++--- .../innodb_zip/t/wl6344_compress_level.test | 2 +- mysql-test/suite/jp/t/jp_enum_sjis.test | 2 +- mysql-test/suite/jp/t/jp_enum_ucs2.test | 2 +- mysql-test/suite/jp/t/jp_enum_ujis.test | 2 +- mysql-test/suite/jp/t/jp_enum_utf8.test | 2 +- mysql-test/suite/jp/t/jp_union_ujis.test | 2 +- mysql-test/suite/jp/t/jp_where_sjis.test | 2 +- mysql-test/suite/jp/t/jp_where_ucs2.test | 2 +- mysql-test/suite/jp/t/jp_where_ujis.test | 2 +- mysql-test/suite/json/t/json_no_table.test | 2 +- mysql-test/suite/maria/bulk_insert_crash.test | 4 ++-- mysql-test/suite/maria/lock.result | 2 +- mysql-test/suite/maria/lock.test | 2 +- mysql-test/suite/maria/maria3.test | 2 +- .../suite/maria/maria_showlog_error.test | 4 ++-- mysql-test/suite/maria/transaction.test | 4 ++-- .../suite/mariabackup/options_check.result | 2 +- .../suite/mariabackup/options_check.test | 2 +- .../suite/mariabackup/undo_space_id.result | 2 +- .../suite/mariabackup/undo_space_id.test | 2 +- mysql-test/suite/merge/merge.result | 2 +- mysql-test/suite/merge/merge.test | 6 +++--- mysql-test/suite/parts/inc/partition.pre | 18 +++++++++--------- mysql-test/suite/parts/r/backup_log.result | 2 +- mysql-test/suite/parts/t/backup_log.test | 2 +- .../suite/parts/t/backup_log_rocksdb.test | 4 ++-- .../t/part_supported_sql_func_innodb.test | 2 +- .../t/partition_auto_increment_archive.test | 2 +- .../suite/parts/t/partition_basic_innodb.test | 2 +- mysql-test/suite/parts/t/partition_open.test | 2 +- .../include/prepared_stmts_setup.inc | 2 +- .../suite/perfschema/include/socket_event.inc | 2 +- .../suite/perfschema/r/bad_option.result | 2 +- .../r/socket_summary_by_instance_func.result | 2 +- .../socket_summary_by_instance_func_win.result | 2 +- .../r/statement_program_non_nested.result | 2 +- mysql-test/suite/perfschema/t/bad_option.test | 2 +- .../suite/perfschema/t/connect_attrs.test | 8 ++++---- mysql-test/suite/perfschema/t/dml_handler.test | 2 +- .../perfschema/t/hostcache_ipv4_max_con.test | 2 +- .../suite/perfschema/t/indexed_table_io.test | 2 +- mysql-test/suite/perfschema/t/misc.test | 2 +- .../suite/perfschema/t/setup_actors.test | 2 +- .../t/socket_summary_by_event_name_func.test | 2 +- .../t/socket_summary_by_instance_func.test | 4 ++-- .../t/socket_summary_by_instance_func_win.test | 2 +- .../t/statement_program_non_nested.test | 2 +- mysql-test/suite/perfschema/t/table_name.test | 2 +- .../suite/perfschema/t/table_schema.test | 2 +- .../suite/perfschema/t/threads_mysql.test | 2 +- mysql-test/suite/period/r/update.result | 2 +- mysql-test/suite/period/t/update.test | 2 +- mysql-test/suite/plugins/r/dialog.result | 4 ++-- mysql-test/suite/plugins/r/pam.result | 14 +++++++------- mysql-test/suite/plugins/r/pam_v1.result | 8 ++++---- .../plugins/r/password_reuse_check.result | 4 ++-- .../plugins/r/server_audit_pwd_mask.result | 2 +- mysql-test/suite/plugins/t/dialog.test | 4 ++-- mysql-test/suite/plugins/t/pam.test | 14 +++++++------- mysql-test/suite/plugins/t/pam_v1.test | 8 ++++---- .../suite/plugins/t/password_reuse_check.test | 4 ++-- .../suite/plugins/t/server_audit_pwd_mask.test | 2 +- mysql-test/suite/roles/acl_statistics.test | 2 +- mysql-test/suite/roles/definer.test | 10 +++++----- mysql-test/suite/roles/set_role-13655.result | 2 +- mysql-test/suite/roles/set_role-13655.test | 2 +- .../rpl/include/create_recursive_construct.inc | 2 +- .../suite/rpl/include/rpl_blackhole_basic.test | 4 ++-- mysql-test/suite/rpl/include/rpl_ddl.test | 2 +- mysql-test/suite/rpl/include/rpl_deadlock.test | 4 ++-- .../suite/rpl/include/rpl_extra_col_slave.test | 2 +- .../include/rpl_implicit_commit_binlog.test | 2 +- .../suite/rpl/include/rpl_insert_id.test | 2 +- .../include/rpl_lower_case_table_names.test | 2 +- .../suite/rpl/include/rpl_mixing_engines.test | 4 ++-- mysql-test/suite/rpl/include/rpl_partition.inc | 2 +- .../suite/rpl/include/rpl_row_func003.test | 2 +- .../suite/rpl/include/rpl_row_sp007.test | 2 +- .../suite/rpl/include/rpl_stm_EE_err2.test | 2 +- .../rpl/include/rpl_stop_middle_group.test | 4 ++-- .../suite/rpl/include/rpl_stop_slave.test | 2 +- .../rpl/r/rpl_alter_extra_persistent.result | 2 +- .../suite/rpl/r/rpl_deadlock_innodb.result | 2 +- .../rpl/r/rpl_gtid_excess_initial_delay.result | 2 +- .../suite/rpl/r/rpl_gtid_grouping.result | 4 ++-- .../suite/rpl/r/rpl_gtid_mdev9033.result | 2 +- .../r/rpl_mixed_implicit_commit_binlog.result | 2 +- .../r/rpl_mysql_manager_race_condition.result | 2 +- mysql-test/suite/rpl/r/rpl_name_const.result | 2 +- .../suite/rpl/r/rpl_partition_archive.result | 2 +- .../suite/rpl/r/rpl_partition_innodb.result | 2 +- .../suite/rpl/r/rpl_partition_memory.result | 2 +- .../suite/rpl/r/rpl_partition_myisam.result | 2 +- .../rpl/r/rpl_perfschema_applier_config.result | 4 ++-- .../suite/rpl/r/rpl_row_idempotency.result | 2 +- .../r/rpl_row_implicit_commit_binlog.result | 2 +- .../suite/rpl/r/rpl_set_statement.result | 2 +- mysql-test/suite/rpl/r/rpl_sp.result | 2 +- .../r/rpl_stm_implicit_commit_binlog.result | 2 +- mysql-test/suite/rpl/r/rpl_stop_slave.result | 2 +- mysql-test/suite/rpl/r/rpl_sync.result | 2 +- .../r/rpl_system_versioning_partitions.result | 2 +- .../suite/rpl/r/rpl_temp_table_mix_row.result | 2 +- mysql-test/suite/rpl/t/circular_serverid0.test | 2 +- mysql-test/suite/rpl/t/parallel_backup.test | 2 +- mysql-test/suite/rpl/t/rpl_000013.test | 2 +- .../rpl/t/rpl_alter_extra_persistent.test | 2 +- mysql-test/suite/rpl/t/rpl_binlog_errors.test | 2 +- mysql-test/suite/rpl/t/rpl_binlog_grant.test | 2 +- mysql-test/suite/rpl/t/rpl_blackhole.test | 4 ++-- mysql-test/suite/rpl/t/rpl_change_master.test | 2 +- mysql-test/suite/rpl/t/rpl_checksum_cache.test | 2 +- .../suite/rpl/t/rpl_circular_semi_sync.test | 2 +- .../suite/rpl/t/rpl_concurrency_error.test | 2 +- mysql-test/suite/rpl/t/rpl_ctype_latin1.test | 2 +- mysql-test/suite/rpl/t/rpl_delayed_slave.test | 2 +- mysql-test/suite/rpl/t/rpl_events.test | 2 +- mysql-test/suite/rpl/t/rpl_get_lock.test | 2 +- .../t/rpl_get_master_version_and_clock.test | 2 +- .../suite/rpl/t/rpl_gtid_errorhandling.test | 2 +- .../rpl/t/rpl_gtid_excess_initial_delay.test | 2 +- mysql-test/suite/rpl/t/rpl_gtid_grouping.test | 4 ++-- mysql-test/suite/rpl/t/rpl_gtid_mdev9033.test | 2 +- .../suite/rpl/t/rpl_gtid_stop_start.test | 2 +- .../suite/rpl/t/rpl_invoked_features.test | 2 +- .../t/rpl_mysql_manager_race_condition.test | 2 +- .../rpl/t/rpl_mysqldump_gtid_slave_pos.test | 4 ++-- mysql-test/suite/rpl/t/rpl_name_const.test | 2 +- mysql-test/suite/rpl/t/rpl_parallel_29322.test | 2 +- .../rpl/t/rpl_parallel_deadlock_victim2.test | 2 +- .../rpl_parallel_domain_slave_single_grp.test | 2 +- .../rpl/t/rpl_parallel_ignored_errors.test | 2 +- .../suite/rpl/t/rpl_parallel_optimistic.test | 2 +- .../t/rpl_parallel_optimistic_error_stop.test | 2 +- .../rpl/t/rpl_parallel_optimistic_until.test | 6 +++--- .../rpl/t/rpl_parallel_retry_deadlock.test | 2 +- .../rpl/t/rpl_parallel_stop_on_con_kill.test | 2 +- .../suite/rpl/t/rpl_parallel_xa_same_xid.test | 2 +- .../rpl/t/rpl_perfschema_applier_config.test | 8 ++++---- ...rfschema_applier_status_by_coordinator.test | 4 ++-- ...pl_perfschema_applier_status_by_worker.test | 2 +- mysql-test/suite/rpl/t/rpl_report_port.test | 2 +- mysql-test/suite/rpl/t/rpl_row_4_bytes.test | 2 +- .../suite/rpl/t/rpl_row_annotate_do.test | 2 +- mysql-test/suite/rpl/t/rpl_row_find_row.test | 2 +- mysql-test/suite/rpl/t/rpl_row_func001.test | 2 +- .../suite/rpl/t/rpl_row_idempotency.test | 4 ++-- mysql-test/suite/rpl/t/rpl_row_img_blobs.test | 2 +- mysql-test/suite/rpl/t/rpl_row_sp009.test | 2 +- mysql-test/suite/rpl/t/rpl_row_to_stmt.test | 2 +- .../suite/rpl/t/rpl_row_type_conv_err_msg.test | 2 +- mysql-test/suite/rpl/t/rpl_row_utf32.test | 2 +- .../suite/rpl/t/rpl_semi_sync_fail_over.test | 2 +- mysql-test/suite/rpl/t/rpl_server_id2.test | 2 +- mysql-test/suite/rpl/t/rpl_set_statement.test | 2 +- mysql-test/suite/rpl/t/rpl_slave_grp_exec.test | 2 +- .../rpl/t/rpl_slave_load_tmpdir_not_exist.test | 2 +- .../rpl/t/rpl_slave_shutdown_mdev20821.test | 2 +- mysql-test/suite/rpl/t/rpl_sp.test | 2 +- .../suite/rpl/t/rpl_start_stop_slave.test | 2 +- mysql-test/suite/rpl/t/rpl_stm_no_op.test | 2 +- mysql-test/suite/rpl/t/rpl_stop_slave.test | 2 +- mysql-test/suite/rpl/t/rpl_sync.test | 2 +- .../t/rpl_system_versioning_partitions.test | 4 ++-- .../suite/rpl/t/rpl_temp_table_mix_row.test | 2 +- mysql-test/suite/rpl/t/rpl_temporary.test | 2 +- mysql-test/suite/rpl/t/rpl_timezone.test | 4 ++-- mysql-test/suite/rpl/t/rpl_trans_no_trans.test | 2 +- mysql-test/suite/rpl/t/rpl_trunc_temp.test | 2 +- mysql-test/suite/rpl/t/rpl_view.test | 2 +- mysql-test/suite/rpl/t/rpl_view_multi.test | 2 +- mysql-test/suite/rpl/t/rpl_xa.inc | 4 ++-- mysql-test/suite/rpl/t/rpl_xa_gap_lock.test | 2 +- .../suite/rpl/t/sec_behind_master-5114.test | 2 +- .../suite/s3/replication_partition.result | 4 ++-- mysql-test/suite/s3/replication_partition.test | 4 ++-- mysql-test/suite/sql_sequence/binlog.test | 2 +- mysql-test/suite/sql_sequence/create.test | 2 +- mysql-test/suite/sql_sequence/replication.test | 2 +- .../r/automatic_sp_privileges_func.result | 2 +- .../sys_vars/r/concurrent_insert_func.result | 2 +- .../r/group_concat_max_len_func.result | 2 +- .../r/max_binlog_cache_size_func.result | 2 +- .../r/metadata_locks_cache_size_basic.result | 2 +- .../t/auto_increment_increment_basic.test | 2 +- .../t/auto_increment_offset_basic.test | 2 +- .../t/automatic_sp_privileges_func.test | 2 +- .../sys_vars/t/concurrent_insert_func.test | 4 ++-- .../t/debug_dbug_func_notembedded.test | 2 +- .../sys_vars/t/delayed_insert_limit_func.test | 2 +- .../sys_vars/t/group_concat_max_len_func.test | 2 +- mysql-test/suite/sys_vars/t/identity_func.test | 2 +- .../innodb_max_dirty_pages_pct_lwm_basic.test | 2 +- .../suite/sys_vars/t/local_infile_func.test | 2 +- .../sys_vars/t/lock_wait_timeout_basic.test | 2 +- .../suite/sys_vars/t/max_join_size_basic.test | 2 +- .../sys_vars/t/max_seeks_for_key_func.test | 2 +- .../t/metadata_locks_cache_size_basic.test | 2 +- .../sys_vars/t/net_read_timeout_basic.test | 2 +- .../sys_vars/t/relay_log_recovery_basic.test | 2 +- .../suite/sys_vars/t/rpl_init_slave_func.test | 2 +- .../suite/sys_vars/t/secure_file_priv.test | 2 +- .../suite/sys_vars/t/secure_file_priv2.test | 2 +- .../sys_vars/t/stored_program_cache_func.test | 2 +- .../t/timestamp_sysdate_is_now_func.test | 2 +- .../t/transaction_prealloc_size_bug27322.test | 2 +- .../suite/sys_vars/t/wait_timeout_basic.test | 2 +- .../t/wsrep_sst_receive_address_basic.test | 2 +- .../suite/sysschema/r/pr_table_exists.result | 2 +- .../suite/sysschema/t/fn_format_bytes.test | 2 +- .../sysschema/t/fn_ps_is_account_enabled.test | 2 +- .../sysschema/t/pr_create_synonym_db.test | 2 +- .../t/pr_ps_trace_statement_digest.test | 2 +- .../suite/sysschema/t/pr_table_exists.test | 2 +- .../vcol/inc/vcol_dependancies_on_vcol.inc | 2 +- mysql-test/suite/vcol/r/vcol_sql_mode.result | 4 ++-- mysql-test/suite/vcol/t/vcol_sql_mode.test | 4 ++-- mysql-test/suite/versioning/r/partition.result | 2 +- mysql-test/suite/versioning/t/partition.test | 2 +- mysql-test/suite/versioning/t/rpl_mix.test | 2 +- .../suite/wsrep/t/wsrep-recover-v25.test | 2 +- mysql-test/suite/wsrep/t/wsrep-recover.test | 2 +- mysql-test/valgrind.supp | 2 +- .../connect/mysql-test/connect/r/pivot.result | 2 +- storage/connect/mysql-test/connect/t/fmt.test | 2 +- .../connect/mysql-test/connect/t/pivot.test | 2 +- .../mysql-test/rocksdb/include/bulk_load.inc | 2 +- .../rocksdb/include/group_min_max.inc | 2 +- .../t/allow_to_start_after_corruption.test | 2 +- .../rocksdb/t/autoinc_vars_thread_2.test | 4 ++-- .../mysql-test/rocksdb/t/bloomfilter2.test | 2 +- .../rocksdb/t/bloomfilter_bulk_load.test | 2 +- .../mysql-test/rocksdb/t/cardinality.test | 2 +- .../rocksdb/t/get_error_message.test | 2 +- .../rocksdb/t/index_merge_rocksdb2.test | 2 +- .../rocksdb/t/issue243_transactionStatus.test | 2 +- .../mysql-test/rocksdb/t/partition.test | 4 ++-- .../mysql-test/rocksdb/t/read_only_tx.test | 2 +- .../rocksdb/mysql-test/rocksdb/t/rocksdb.test | 4 ++-- .../rocksdb/t/rocksdb_cf_per_partition.test | 2 +- .../rocksdb/t/rocksdb_deadlock_stress.py | 2 +- .../rocksdb/t/skip_core_dump_on_error.test | 2 +- .../mysql-test/rocksdb/t/statistics.test | 2 +- .../rocksdb/t/truncate_partition.inc | 2 +- .../t/consistent_snapshot_mixed_engines.test | 2 +- .../rocksdb_stress/t/load_generator.py | 2 +- ...ksdb_strict_collation_exceptions_basic.test | 2 +- 682 files changed, 967 insertions(+), 968 deletions(-) diff --git a/mysql-test/include/check-testcase.inc b/mysql-test/include/check-testcase.inc index ca042432d83..e1541b46168 100644 --- a/mysql-test/include/check-testcase.inc +++ b/mysql-test/include/check-testcase.inc @@ -3,8 +3,8 @@ # This test is executed twice for each test case. Before every # testcase it is run with mysqltest in record mode and will thus # produce an output file that can be compared to output from after the -# tescase. In that way, it is possible to check that a testcase does -# not have any unwanted side affects. +# testcase. In that way, it is possible to check that a testcase does +# not have any unwanted side effects.. --disable_query_log diff --git a/mysql-test/include/common-tests.inc b/mysql-test/include/common-tests.inc index 9331731b52c..890309be5e0 100644 --- a/mysql-test/include/common-tests.inc +++ b/mysql-test/include/common-tests.inc @@ -1524,7 +1524,7 @@ INSERT INTO t4 (companynr, companyname) VALUES (00,'Unknown'); --enable_query_log # -# Test of stright join to force a full join. +# Test of straight join to force a full join. # select STRAIGHT_JOIN t2.companynr,companyname from t4,t2 where t2.companynr=t4.companynr group by t2.companynr; @@ -1592,7 +1592,7 @@ explain select distinct t2.companynr,t4.companynr from t2,t4 where t2.companynr= SET @@join_cache_level=@local_join_cache_level; # -# Search using 'or' with the same referens group. +# Search using 'or' with the same reference group. # An interval search will be done first with the first table and after that # the other table is referenced with a key with a 'test if key in use' for # each record diff --git a/mysql-test/include/concurrent.inc b/mysql-test/include/concurrent.inc index f9058c069ca..db28e6bd352 100644 --- a/mysql-test/include/concurrent.inc +++ b/mysql-test/include/concurrent.inc @@ -454,7 +454,7 @@ drop table t1; --echo ** Table will be unchanged and the select command will not be --echo ** blocked: select * from t1; - --echo ** Commit transacton on thread 2. + --echo ** Commit transaction on thread 2. commit; connection thread1; @@ -500,7 +500,7 @@ drop table t1; send delete from t1 where tipo=2; # The sleep has not been replaced as all tried wait conditions leaded to sporadically # succeding update in the following thread. Also the used status variables '%lock%' and -# 'innodb_deleted_rows' and infos in processlist where not sucessful. +# 'innodb_deleted_rows' and infos in processlist were not successful. sleep 1; connection thread1; @@ -555,7 +555,7 @@ drop table t1; send delete from t1 where tipo=2; # The sleep has not been replaced as all tried wait conditions leaded to sporadically # succeding update in the following thread. Also the used status variables '%lock%' and -# 'innodb_deleted_rows' and infos in processlist where not sucessful. +# 'innodb_deleted_rows' and infos in processlist were not successful. sleep 1; --disable_view_protocol connection thread1; diff --git a/mysql-test/include/ctype_unescape.inc b/mysql-test/include/ctype_unescape.inc index d7a8a27509a..0773c3a9ce6 100644 --- a/mysql-test/include/ctype_unescape.inc +++ b/mysql-test/include/ctype_unescape.inc @@ -39,7 +39,7 @@ if ($ctype_unescape_combinations == 'selected') --source include/bytes.inc # # Populate "selected_bytes" with bytes that have a special meaning. -# We'll use "selected_bytes" to generate byte seqeunces, +# We'll use "selected_bytes" to generate byte sequences, # instead of the full possible byte combinations, to reduce test time. # CREATE TABLE selected_bytes (a VARBINARY(10)); diff --git a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf index 53c838921eb..76a111bb053 100644 --- a/mysql-test/include/default_mysqld.cnf +++ b/mysql-test/include/default_mysqld.cnf @@ -96,7 +96,7 @@ loose-performance-schema-max-thread-instances=400 loose-performance-schema-session-connect-attrs-size=2048 loose-performance-schema-max-metadata-locks=10000 -# Enable everything, for maximun code exposure during testing +# Enable everything, for maximum code exposure during testing loose-performance-schema-instrument='%=ON' diff --git a/mysql-test/include/execute_with_statistics.inc b/mysql-test/include/execute_with_statistics.inc index c2305fe5247..a9377841932 100644 --- a/mysql-test/include/execute_with_statistics.inc +++ b/mysql-test/include/execute_with_statistics.inc @@ -2,12 +2,12 @@ # # SUMMARY # -# Explain and execute the select statment in $query. +# Explain and execute the select statement in $query. # Then report 'Last_query_cost' estimate from the query # optimizer and total number of 'Handler_read%' when the # query was executed. -# Intended usage is to verify that there are not regressions -# in either calculated or actuall cost for $query. +# Intended usage is to verify that there are no regressions +# in either calculated or actual cost for $query. # # USAGE # diff --git a/mysql-test/include/index_merge_ror.inc b/mysql-test/include/index_merge_ror.inc index 8a55ef1a67d..4ca23aec062 100644 --- a/mysql-test/include/index_merge_ror.inc +++ b/mysql-test/include/index_merge_ror.inc @@ -199,7 +199,7 @@ select key1,key2,key3,key4,filler1 from t1 where key3=200 or (key1=100 and key2= explain select * from t1 where st_a=1 and st_b=1; explain select st_a,st_b from t1 where st_a=1 and st_b=1; -# Check if "ingore index" syntax works +# Check if "ignore index" syntax works explain select st_a from t1 ignore index (st_a) where st_a=1 and st_b=1; # Do many tests diff --git a/mysql-test/include/mix2.inc b/mysql-test/include/mix2.inc index 5ea4b79531c..2f7ed28ab56 100644 --- a/mysql-test/include/mix2.inc +++ b/mysql-test/include/mix2.inc @@ -902,7 +902,7 @@ DROP TABLE t1,t2,t3; eval CREATE TABLE t1 (a int not null primary key, b int not null, unique (b)) engine=$engine_type; INSERT INTO t1 values (1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9); -# We need the a < 1000 test here to quard against the halloween problems +# We need the a < 1000 test here to guard against the halloween problems UPDATE t1 set a=a+100 where b between 2 and 3 and a < 1000; SELECT * from t1; drop table t1; @@ -1035,7 +1035,7 @@ drop table t1; if ($test_foreign_keys) { # -# Test dictionary handling with spaceand quoting +# Test dictionary handling with space and quoting # eval CREATE TABLE t1 (`id 1` INT NOT NULL, PRIMARY KEY (`id 1`)) ENGINE=$engine_type; diff --git a/mysql-test/include/plugin.defs b/mysql-test/include/plugin.defs index f2b754eb93a..747f2ff2e4e 100644 --- a/mysql-test/include/plugin.defs +++ b/mysql-test/include/plugin.defs @@ -17,7 +17,7 @@ # The PLUGVAR variable is not quoted, so you must remember to quote it # when using it in an INSTALL PLUGIN command. # -# The envorinment variables can be used in tests. If adding a new plugin, +# The environment variables can be used in tests. If adding a new plugin, # you are free to pick your variable name, but please keep it upper # case for consistency. # diff --git a/mysql-test/include/sync_io_with_master.inc b/mysql-test/include/sync_io_with_master.inc index 34906c416f5..7388d27f51d 100644 --- a/mysql-test/include/sync_io_with_master.inc +++ b/mysql-test/include/sync_io_with_master.inc @@ -2,7 +2,7 @@ # # Waits until the slave IO thread on the current connection has been # synced up to the point saved by the last call to -# include/save_master_pos.inc (i.e., until the IO thead has copied up +# include/save_master_pos.inc (i.e., until the IO thread has been copied # to the saved position). Does not wait for the SQL thread. # # diff --git a/mysql-test/lib/My/Config.pm b/mysql-test/lib/My/Config.pm index c88b1170a80..3a83f26b05a 100644 --- a/mysql-test/lib/My/Config.pm +++ b/mysql-test/lib/My/Config.pm @@ -301,7 +301,7 @@ sub new { # Check that the file exists relative to path of first config file if (! -f $include_file_name){ - # Try to include file relativ to current dir + # Try to include file relative to current dir $include_file_name= $1; } croak "The include file '$include_file_name' does not exist" diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index 5a5b691998c..dd308d1b87d 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -63,7 +63,7 @@ sub get_testdir { return $testdir; } -# Retrive build directory (which is different from basedir in out-of-source build) +# Retrieve build directory (which is different from basedir in out-of-source build) sub get_bindir { if (defined $ENV{MTR_BINDIR}) { diff --git a/mysql-test/lib/My/CoreDump.pm b/mysql-test/lib/My/CoreDump.pm index be6d21146d1..b90b54de650 100644 --- a/mysql-test/lib/My/CoreDump.pm +++ b/mysql-test/lib/My/CoreDump.pm @@ -352,7 +352,7 @@ sub _cdb { my $image_path= join(";", (keys %dirhash),"."); # For better callstacks, setup _NT_SYMBOL_PATH to include - # OS symbols. Note : Dowloading symbols for the first time + # OS symbols. Note : Downloading symbols for the first time # can take some minutes if (!$ENV{'_NT_SYMBOL_PATH'}) { @@ -382,7 +382,7 @@ sub _cdb { return unless $cdb_output; # Remove comments (lines starting with *), stack pointer and frame - # pointer adresses and offsets to function to make output better readable + # pointer addresses and offsets to function to make output better readable $cdb_output=~ s/^\*.*\n//gm; $cdb_output=~ s/^([\:0-9a-fA-F\`]+ )+//gm; $cdb_output=~ s/^ChildEBP RetAddr//gm; diff --git a/mysql-test/lib/My/Platform.pm b/mysql-test/lib/My/Platform.pm index 279fea02ffb..47867ce519c 100644 --- a/mysql-test/lib/My/Platform.pm +++ b/mysql-test/lib/My/Platform.pm @@ -168,7 +168,7 @@ sub check_socket_path_length { Local => $testfile, Listen => 1, ); - $truncated= 1; # Be negatvie + $truncated= 1; # Be negative die "Could not create UNIX domain socket: $!" unless defined $sock; diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm index e3b46b3709e..8cbe48220f0 100644 --- a/mysql-test/lib/My/SafeProcess.pm +++ b/mysql-test/lib/My/SafeProcess.pm @@ -196,7 +196,7 @@ sub new { my $proc= bless ({ SAFE_PID => $pid, - SAFE_WINPID => $pid, # Inidicates this is always a real process + SAFE_WINPID => $pid, # Indicates this is always a real process SAFE_NAME => $name, SAFE_SHUTDOWN => $shutdown, PARENT => $$, @@ -539,7 +539,7 @@ sub wait_any_timeout { do { ::mtr_milli_sleep($millis); - # Slowly increse interval up to max. 1 second + # Slowly increase interval up to max. 1 second $millis++ if $millis < 1000; # Return a "fake" process for timeout if (::has_expired($timeout)) { diff --git a/mysql-test/lib/My/SafeProcess/Base.pm b/mysql-test/lib/My/SafeProcess/Base.pm index 91ebdc8fe11..9b9073c48bf 100644 --- a/mysql-test/lib/My/SafeProcess/Base.pm +++ b/mysql-test/lib/My/SafeProcess/Base.pm @@ -160,7 +160,7 @@ sub create_process { die "create_process failed: $^E"; } - # Retore IO redirects + # Restore IO redirects open STDERR, '>&', $olderr or croak("unable to reestablish STDERR"); open STDOUT, '>&', $oldout diff --git a/mysql-test/lib/My/SafeProcess/safe_process.cc b/mysql-test/lib/My/SafeProcess/safe_process.cc index dcf9491d2d6..f278e5a84c4 100644 --- a/mysql-test/lib/My/SafeProcess/safe_process.cc +++ b/mysql-test/lib/My/SafeProcess/safe_process.cc @@ -201,7 +201,7 @@ extern "C" void handle_signal(int sig) signal(SIGINT, SIG_IGN); signal(SIGHUP, SIG_IGN); - // Continune execution, allow the child to be started and + // Continue execution, allow the child to be started and // finally terminated by monitor loop } diff --git a/mysql-test/lib/My/SafeProcess/safe_process_win.cc b/mysql-test/lib/My/SafeProcess/safe_process_win.cc index 6e1fd414287..024700ad225 100644 --- a/mysql-test/lib/My/SafeProcess/safe_process_win.cc +++ b/mysql-test/lib/My/SafeProcess/safe_process_win.cc @@ -310,10 +310,10 @@ int main(int argc, const char** argv ) terminated when the last handle to it is closed(which is owned by this process). - If breakaway from job fails on some reason, fallback is to create a + If breakaway from job fails for some reason, fallback is to create a new process group. Process groups also allow to kill process and its - descedants, subject to some restrictions (processes have to run within - the same console,and must not ignore CTRL_BREAK) + descendants, subject to some restrictions (processes have to run within + the same console, and must not ignore CTRL_BREAK) */ DWORD create_flags[]= {CREATE_BREAKAWAY_FROM_JOB, CREATE_NEW_PROCESS_GROUP, 0}; BOOL process_created= FALSE; diff --git a/mysql-test/lib/My/SysInfo.pm b/mysql-test/lib/My/SysInfo.pm index 211f72c0561..a8b3d2c632f 100644 --- a/mysql-test/lib/My/SysInfo.pm +++ b/mysql-test/lib/My/SysInfo.pm @@ -185,7 +185,7 @@ sub isvm { } -# Prit the cpuinfo +# Print the cpuinfo sub print_info { my ($self)= @_; diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 00c51c7eee4..db22cd0c1ee 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -84,7 +84,7 @@ sub init_pattern { return undef unless defined $from; if ( $from =~ /^[a-z0-9\.]*$/ ) { # Does not contain any regex (except . that we allow as - # separator betwen suite and testname), make the pattern match + # separator between suite and testname), make the pattern match # beginning of string $from= "^$from"; mtr_verbose2("$what='$from'"); @@ -184,7 +184,7 @@ sub collect_test_cases ($$$$) { # # Collect the criteria for sorting, in order of importance. # Note that criteria are also used in mysql-test-run.pl to - # schedule tests to workers, and it preferres tests that have + # schedule tests to workers, and it prefers tests that have # *identical* criteria. That is, test name is *not* part of # the criteria, but it's part of the sorting function below. # @@ -487,7 +487,7 @@ sub process_suite { $suitedir)); # - # Read suite config files, unless it was done aleady + # Read suite config files, unless it was done already # unless (defined $suite->{name}) { $suite->{name} = $suitename; diff --git a/mysql-test/lib/v1/mtr_cases.pl b/mysql-test/lib/v1/mtr_cases.pl index 285d3142dbe..968f13bcc61 100644 --- a/mysql-test/lib/v1/mtr_cases.pl +++ b/mysql-test/lib/v1/mtr_cases.pl @@ -115,9 +115,8 @@ sub collect_test_cases ($) { { my @criteria = (); - # Look for tests that muct be in run in a defined order - # that is defined by test having the same name except for - # the ending digit + # Look for tests that must be run in an order defined by + # test having the same name except for the ending digit # Put variables into hash my $test_name= $tinfo->{'name'}; @@ -180,7 +179,7 @@ sub collect_test_cases ($) { } -# Valid extensions and their corresonding component id +# Valid extensions and their corresponding component id my %exts = ( 'test' => 'mysqld', 'imtest' => 'im' ); @@ -274,7 +273,7 @@ sub collect_one_suite($) #print " tname: $tname\n"; #print " extension: $extension\n"; - # Check cirrect suite if suitename is defined + # Check correct suite if suitename is defined next if (defined $sname and $suite ne $sname); my $component_id; diff --git a/mysql-test/lib/v1/mtr_process.pl b/mysql-test/lib/v1/mtr_process.pl index fd9f3817699..9630190871c 100644 --- a/mysql-test/lib/v1/mtr_process.pl +++ b/mysql-test/lib/v1/mtr_process.pl @@ -386,10 +386,10 @@ sub mtr_kill_leftovers () { # We now have tried to terminate nice. We have waited for the listen # port to be free, but can't really tell if the mysqld process died # or not. We now try to find the process PID from the PID file, and - # send a kill to that process. Note that Perl let kill(0,@pids) be - # a way to just return the numer of processes the kernel can send + # send a kill to that process. Note that Perl lets kill(0,@pids) be + # a way to just return the number of processes the kernel can send # signals to. So this can be used (except on Cygwin) to determine - # if there are processes left running that we cound out might exists. + # if there are processes left running that we count out might exists. # # But still after all this work, all we know is that we have # the ports free. @@ -618,7 +618,7 @@ sub mtr_check_stop_servers ($) { if ($::glob_win32_perl and $srv->{'real_pid'}) { # Wait for the pseudo pid - if the real_pid was known - # the pseudo pid has not been waited for yet, wai blocking + # the pseudo pid has not been waited for yet, wait blocking # since it's "such a simple program" mtr_verbose("Wait for pseudo process $srv->{'pid'}"); my $ret_pid= waitpid($srv->{'pid'}, 0); @@ -844,8 +844,8 @@ sub mtr_record_dead_children () { my $process_died= 0; my $ret_pid; - # Wait without blockinng to see if any processes had died - # -1 or 0 means there are no more procesess to wait for + # Wait without blocking to see if any processes had died + # -1 or 0 means there are no more processes to wait for while ( ($ret_pid= waitpid(-1,&WNOHANG)) != 0 and $ret_pid != -1) { mtr_warning("mtr_record_dead_children: $ret_pid"); diff --git a/mysql-test/lib/v1/mtr_report.pl b/mysql-test/lib/v1/mtr_report.pl index 6f8677110ba..84da3c6d84e 100644 --- a/mysql-test/lib/v1/mtr_report.pl +++ b/mysql-test/lib/v1/mtr_report.pl @@ -347,7 +347,7 @@ sub mtr_report_stats ($) { /Stored routine 'test'.'bug14233_3': invalid value in column mysql.proc/ or # BUG#29839 - lowercase_table3.test: Cannot find table test/T1 - # from the internal data dictiona + # from the internal data dictionary /Cannot find table test\/BUG29839 from the internal data dictionary/ or # BUG#32080 - Excessive warnings on Solaris: setrlimit could not # change the size of core files diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl index ebae1e921e7..5a3891fa480 100755 --- a/mysql-test/lib/v1/mysql-test-run.pl +++ b/mysql-test/lib/v1/mysql-test-run.pl @@ -31,8 +31,8 @@ # # Coding style directions for this perl script # -# - To make this Perl script easy to alter even for those that not -# code Perl that often, keeep the coding style as close as possible to +# - To make this Perl script easy to alter even for those that do not +# code Perl that often, keep the coding style as close as possible to # the C/C++ MySQL coding standard. # # - All lists of arguments to send to commands are Perl lists/arrays, @@ -926,7 +926,7 @@ sub command_line_setup () { } # -------------------------------------------------------------------------- - # ps protcol flag + # ps protocol flag # -------------------------------------------------------------------------- if ( $opt_ps_protocol ) { @@ -1571,8 +1571,8 @@ sub environment_setup () { } # -------------------------------------------------------------------------- - # Valgrind need to be run with debug libraries otherwise it's almost - # impossible to add correct supressions, that means if "/usr/lib/debug" + # Valgrind needs to be run with debug libraries otherwise it's almost + # impossible to add correct suppressions, that means if "/usr/lib/debug" # is available, it should be added to # LD_LIBRARY_PATH # @@ -1668,7 +1668,7 @@ sub environment_setup () { $ENV{'MYSQL_CHECK'}= $cmdline_mysqlcheck; # ---------------------------------------------------- - # Setup env to childs can execute myqldump + # Setup env to childs can execute mysqldump # ---------------------------------------------------- my $cmdline_mysqldump= generate_cmdline_mysqldump($master->[0]); my $cmdline_mysqldumpslave= generate_cmdline_mysqldump($slave->[0]); @@ -2411,7 +2411,7 @@ sub mysql_install_db () { copy_install_db('master', $master->[1]->{'path_myddir'}); } - # Install the number of slave databses needed + # Install the number of slave databases needed for (my $idx= 0; $idx < $max_slave_num; $idx++) { copy_install_db("slave".($idx+1), $slave->[$idx]->{'path_myddir'}); @@ -3083,7 +3083,7 @@ sub mysqld_arguments ($$$$) { if (!$opt_extern and $mysql_version_id >= 50106 ) { - # Turn on logging to bothe tables and file + # Turn on logging to both tables and file mtr_add_arg($args, "%s--log-output=table,file", $prefix); } diff --git a/mysql-test/main/alter_table-big.test b/mysql-test/main/alter_table-big.test index 66f95938107..547e99c0fe9 100644 --- a/mysql-test/main/alter_table-big.test +++ b/mysql-test/main/alter_table-big.test @@ -1,5 +1,5 @@ # -# Tests for various concurrency-related aspects of ALTER TABLE implemetation +# Tests for various concurrency-related aspects of ALTER TABLE implementation # # This test takes rather long time so let us run it only in --big-test mode --source include/big_test.inc diff --git a/mysql-test/main/alter_table.result b/mysql-test/main/alter_table.result index 20c0876974f..3b20879637a 100644 --- a/mysql-test/main/alter_table.result +++ b/mysql-test/main/alter_table.result @@ -1220,7 +1220,7 @@ info: Records: 2 Duplicates: 0 Warnings: 0 ALTER TABLE t1 MODIFY COLUMN a SET('a1','a2','a0','xx','a5','a6'); affected rows: 0 info: Records: 0 Duplicates: 0 Warnings: 0 -# Copy: Numerical incrase (pack lenght) +# Copy: Numerical increase (pack length) ALTER TABLE t1 MODIFY COLUMN a SET('a1','a2','a0','xx','a5','a6','a7','a8','a9','a10'); affected rows: 2 info: Records: 2 Duplicates: 0 Warnings: 0 diff --git a/mysql-test/main/alter_table.test b/mysql-test/main/alter_table.test index fbd2c465e0d..e44e14e6933 100644 --- a/mysql-test/main/alter_table.test +++ b/mysql-test/main/alter_table.test @@ -1053,7 +1053,7 @@ ALTER TABLE t1 MODIFY COLUMN a SET('a1','a2','xx'); ALTER TABLE t1 MODIFY COLUMN a SET('a1','a2','a0','xx'); --echo # No copy: Add new to the end ALTER TABLE t1 MODIFY COLUMN a SET('a1','a2','a0','xx','a5','a6'); ---echo # Copy: Numerical incrase (pack lenght) +--echo # Copy: Numerical increase (pack length) ALTER TABLE t1 MODIFY COLUMN a SET('a1','a2','a0','xx','a5','a6','a7','a8','a9','a10'); --disable_info DROP TABLE t1; diff --git a/mysql-test/main/analyze_format_json.test b/mysql-test/main/analyze_format_json.test index 87ed02d0406..b4cb24b0335 100644 --- a/mysql-test/main/analyze_format_json.test +++ b/mysql-test/main/analyze_format_json.test @@ -338,7 +338,7 @@ between 400 and 450; # r_rows_idx=2 (average 4 (1+3)/2 scans = 2 rows per scan) # r_icp_filtered=50 (4 rows total, 2 survive the icp, both in the second scan) # for t13.a=1, 0 rows after ICP -# for t13.a=2, 2 rows after ICP, 1 survives the rowid_filter (t12.c bewteen 400 and 500) +# for t13.a=2, 2 rows after ICP, 1 survives the rowid_filter (t12.c between 400 and 500) # rowid_filter r_lookups=2 (2 / 2 loops) # rowid_filter r_selectivity_pct = 50 (1 survived / 2 rows after ICP) --source include/analyze-format.inc diff --git a/mysql-test/main/auto_increment.test b/mysql-test/main/auto_increment.test index db7ea0be928..d1d30b3848f 100644 --- a/mysql-test/main/auto_increment.test +++ b/mysql-test/main/auto_increment.test @@ -171,7 +171,7 @@ select * from t1 order by b; drop table t1; # -# Test of behavior of ALTER TABLE when coulmn containing NULL or zeroes is +# Test of behavior of ALTER TABLE when column containing NULL or zeroes is # converted to AUTO_INCREMENT column # create table t1 (a bigint); diff --git a/mysql-test/main/bigint.test b/mysql-test/main/bigint.test index fc7d6a39060..34083353e02 100644 --- a/mysql-test/main/bigint.test +++ b/mysql-test/main/bigint.test @@ -407,7 +407,7 @@ SELECT * FROM t1 WHERE coalesce(a) BETWEEN 0 and 0.9; SELECT * FROM t1 WHERE coalesce(a)=0.9; SELECT * FROM t1 WHERE coalesce(a) in (0.8,0.9); -# b. These queries mistakenely returned 1 row: +# b. These queries mistakenly returned 1 row: SELECT * FROM t1 WHERE a BETWEEN 0 AND 0.9; SELECT * FROM t1 WHERE a=0.9; SELECT * FROM t1 WHERE a IN (0.8,0.9); diff --git a/mysql-test/main/case.test b/mysql-test/main/case.test index bb0fc18c0a3..5a320697f3e 100644 --- a/mysql-test/main/case.test +++ b/mysql-test/main/case.test @@ -88,7 +88,7 @@ CASE _latin1'a' WHEN _latin1'A' COLLATE latin1_bin THEN '1' ELSE 2 END as ; # -# COALESCE is a CASE abbrevation: +# COALESCE is a CASE abbreviation: # # COALESCE(v1,v2) == CASE WHEN v1 IS NOT NULL THEN v1 ELSE v2 END # diff --git a/mysql-test/main/column_compression.test b/mysql-test/main/column_compression.test index f2fb302acb2..042a5716fb0 100644 --- a/mysql-test/main/column_compression.test +++ b/mysql-test/main/column_compression.test @@ -346,7 +346,7 @@ DELIMITER ;$$ # Let's override the default threshold (100) to force -# comression for VARCHAR1+MB, for example, for: +# compression for VARCHAR1+MB, for example, for: # VARCHAR(80) CHARACTER SET utf8mb3 SET @@column_compression_threshold=32; diff --git a/mysql-test/main/comments.result b/mysql-test/main/comments.result index 506c31b07b6..8c03d9db438 100644 --- a/mysql-test/main/comments.result +++ b/mysql-test/main/comments.result @@ -71,7 +71,7 @@ SELECT 1 /*!190000 +1*/; 1 1 # -# Tesing that versions >= 5.7.x and < 10.0.0 are not ignored +# Testing that versions >= 5.7.x and < 10.0.0 are not ignored # when used with the MariaDB executable comment syntax. # SELECT 1 /*M!50699 +1*/; diff --git a/mysql-test/main/comments.test b/mysql-test/main/comments.test index 42cdc4255fd..671e5d65835 100644 --- a/mysql-test/main/comments.test +++ b/mysql-test/main/comments.test @@ -45,7 +45,7 @@ SELECT 1 /*!210000 +1*/; SELECT 1 /*!190000 +1*/; --echo # ---echo # Tesing that versions >= 5.7.x and < 10.0.0 are not ignored +--echo # Testing that versions >= 5.7.x and < 10.0.0 are not ignored --echo # when used with the MariaDB executable comment syntax. --echo # SELECT 1 /*M!50699 +1*/; diff --git a/mysql-test/main/commit.test b/mysql-test/main/commit.test index 7e333ba90da..189c663aeca 100644 --- a/mysql-test/main/commit.test +++ b/mysql-test/main/commit.test @@ -154,7 +154,7 @@ COMMIT; # # Verify isolation level with @completion_type=1. -# (A @@completion_type value of 1 is equivalentl to +# (A @@completion_type value of 1 is equivalent to # explicitly adding "AND CHAIN" to COMMIT or ROLLBACK) # @@ -278,7 +278,7 @@ COMMIT; # # Verify that a transaction ended with an # implicit commit (i.e a DDL statement), the -# @@completetion_type setting is ignored, and +# @@completion_type setting is ignored, and # the next transaction's isolation level is # the session level. # diff --git a/mysql-test/main/compare.test b/mysql-test/main/compare.test index 696486304f2..0caa495d578 100644 --- a/mysql-test/main/compare.test +++ b/mysql-test/main/compare.test @@ -1,5 +1,5 @@ # -# Bug when using comparions of strings and integers. +# Bug when using comparisons of strings and integers. # --disable_warnings diff --git a/mysql-test/main/concurrent_innodb_safelog.result b/mysql-test/main/concurrent_innodb_safelog.result index 182e99256f8..377f65c341f 100644 --- a/mysql-test/main/concurrent_innodb_safelog.result +++ b/mysql-test/main/concurrent_innodb_safelog.result @@ -593,7 +593,7 @@ eta tipo c 70 1 iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii 80 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj 90 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk -** Commit transacton on thread 2. +** Commit transaction on thread 2. commit; connection thread1; ** Commit transaction on thread 1. diff --git a/mysql-test/main/concurrent_innodb_unsafelog.result b/mysql-test/main/concurrent_innodb_unsafelog.result index bd199f4f613..9955d14ffd4 100644 --- a/mysql-test/main/concurrent_innodb_unsafelog.result +++ b/mysql-test/main/concurrent_innodb_unsafelog.result @@ -593,7 +593,7 @@ eta tipo c 70 1 iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii 80 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj 90 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk -** Commit transacton on thread 2. +** Commit transaction on thread 2. commit; connection thread1; ** Commit transaction on thread 1. diff --git a/mysql-test/main/costs.result b/mysql-test/main/costs.result index 9d69207f956..b8ee34cb1c1 100644 --- a/mysql-test/main/costs.result +++ b/mysql-test/main/costs.result @@ -32,7 +32,7 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range PRIMARY PRIMARY 4 NULL 11 Using where; Using index Last_query_cost 0.002747 # -# Shorter indexes are prefered over longer indexs +# Shorter indexes are preferred over longer indexes # explain select sum(a+b) from t1; id select_type table type possible_keys key key_len ref rows Extra diff --git a/mysql-test/main/costs.test b/mysql-test/main/costs.test index bb933a200db..c425390e17d 100644 --- a/mysql-test/main/costs.test +++ b/mysql-test/main/costs.test @@ -34,7 +34,7 @@ explain select count(*) from t1 where a > 2; --source include/last_query_cost.inc --echo # ---echo # Shorter indexes are prefered over longer indexs +--echo # Shorter indexes are preferred over longer indexes --echo # explain select sum(a+b) from t1; --source include/last_query_cost.inc diff --git a/mysql-test/main/create-big.test b/mysql-test/main/create-big.test index 82a4dd82a32..a501d4c5e44 100644 --- a/mysql-test/main/create-big.test +++ b/mysql-test/main/create-big.test @@ -15,7 +15,7 @@ # Save the initial number of concurrent sessions. --source include/count_sessions.inc -# Create auxilliary connections +# Create auxiliary connections connect (addconroot1, localhost, root,,); connect (addconroot2, localhost, root,,); connect (addconroot3, localhost, root,,); diff --git a/mysql-test/main/create.test b/mysql-test/main/create.test index 37da6a4dfbd..42bf890cb75 100644 --- a/mysql-test/main/create.test +++ b/mysql-test/main/create.test @@ -741,7 +741,7 @@ drop table t1; # Error during open_and_lock_tables() of tables --error ER_NO_SUCH_TABLE create table t1 select * from t2; -# A special case which is also caught during open tables pahse +# A special case which is also caught during open tables phase --error ER_NO_SUCH_TABLE create table t1 select * from t1; # Error which happens before select_create::prepare() @@ -771,12 +771,12 @@ drop table t1; --error ER_CANT_AGGREGATE_2COLLATIONS create table t1 select coalesce('a' collate latin1_swedish_ci,'b' collate latin1_bin); -# Base vs temporary tables dillema (a.k.a. bug#24508 "Inconsistent +# Base vs temporary tables dilemma (a.k.a. bug#24508 "Inconsistent # results of CREATE TABLE ... SELECT when temporary table exists"). # In this situation we either have to create non-temporary table and # insert data in it or insert data in temporary table without creation of # permanent table. After patch for Bug#47418, we create the base table and -# instert data into it, even though a temporary table exists with the same +# insert data into it, even though a temporary table exists with the same # name. --disable_view_protocol create temporary table t1 (j int); diff --git a/mysql-test/main/create_drop_db.test b/mysql-test/main/create_drop_db.test index 13391c35a4d..a347a7c4e18 100644 --- a/mysql-test/main/create_drop_db.test +++ b/mysql-test/main/create_drop_db.test @@ -1,4 +1,4 @@ -# Enable diisplaying rows affected +# Enable displaying rows affected --enable_info CREATE DATABASE IF NOT EXISTS db1; diff --git a/mysql-test/main/create_w_max_indexes_64.test b/mysql-test/main/create_w_max_indexes_64.test index 6e614ecf2e5..6e81d4172a5 100644 --- a/mysql-test/main/create_w_max_indexes_64.test +++ b/mysql-test/main/create_w_max_indexes_64.test @@ -5,7 +5,7 @@ # # Problem with creating keys with maximum key-parts and maximum name length # This test is made for a mysql server supporting names up to 64 bytes -# and a maximum of 16 key segements per Key +# and a maximum of 16 key segments per Key # create table t1 ( diff --git a/mysql-test/main/cset_narrowing.result b/mysql-test/main/cset_narrowing.result index 8c5c6809e27..797401c67d8 100644 --- a/mysql-test/main/cset_narrowing.result +++ b/mysql-test/main/cset_narrowing.result @@ -393,7 +393,7 @@ EXPLAIN # # Check multiple equalities # -# - ref acccess lookup keys do use equality substitution, +# - ref access lookup keys do use equality substitution, # - concat() arguments don't explain format=json select straight_join * from t10,t1 force index(mb3),t2 diff --git a/mysql-test/main/cset_narrowing.test b/mysql-test/main/cset_narrowing.test index 6f2606ccf0b..ca3615f8427 100644 --- a/mysql-test/main/cset_narrowing.test +++ b/mysql-test/main/cset_narrowing.test @@ -130,7 +130,7 @@ select * from t10, t2 where t2.mb4>t10.mb4 and t10.pk=3; --echo # Check multiple equalities --echo # ---echo # - ref acccess lookup keys do use equality substitution, +--echo # - ref access lookup keys do use equality substitution, --echo # - concat() arguments don't #Enable after fix MDEV-32034 --disable_view_protocol diff --git a/mysql-test/main/cte_nonrecursive.result b/mysql-test/main/cte_nonrecursive.result index 0e7575548d8..3ac342fb560 100644 --- a/mysql-test/main/cte_nonrecursive.result +++ b/mysql-test/main/cte_nonrecursive.result @@ -56,7 +56,7 @@ where t2.c=t.a; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t2 ALL NULL NULL NULL NULL 4 1 SIMPLE t1 ALL NULL NULL NULL NULL 8 Using where; Using join buffer (flat, BNL join) -# rename fields returned by the specication when defining t +# rename fields returned by the specification when defining t with t(f1,f2) as (select * from t1 where b >= 'c') select * from t2,t where t2.c=t.f1; c f1 f2 @@ -94,7 +94,7 @@ id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t2 ALL NULL NULL NULL NULL 4 Using where 1 PRIMARY ref key0 key0 5 test.t2.c 1 2 DERIVED t1 ALL NULL NULL NULL NULL 8 Using where; Using temporary; Using filesort -# specivication of t contains having +# specification of t contains having with t as (select a, count(*) from t1 where b >= 'c' group by a having count(*)=1 ) select * from t2,t where t2.c=t.a; diff --git a/mysql-test/main/cte_nonrecursive.test b/mysql-test/main/cte_nonrecursive.test index a56b89cf3c8..18168886263 100644 --- a/mysql-test/main/cte_nonrecursive.test +++ b/mysql-test/main/cte_nonrecursive.test @@ -33,7 +33,7 @@ explain select * from t2, (select * from t1 where b >= 'c') as t where t2.c=t.a; ---echo # rename fields returned by the specication when defining t +--echo # rename fields returned by the specification when defining t with t(f1,f2) as (select * from t1 where b >= 'c') select * from t2,t where t2.c=t.f1; explain @@ -52,7 +52,7 @@ explain select * from t2, (select a, count(*) from t1 where b >= 'c' group by a) as t where t2.c=t.a; ---echo # specivication of t contains having +--echo # specification of t contains having with t as (select a, count(*) from t1 where b >= 'c' group by a having count(*)=1 ) select * from t2,t where t2.c=t.a; diff --git a/mysql-test/main/cte_recursive.test b/mysql-test/main/cte_recursive.test index 7bb00885283..ead238eb845 100644 --- a/mysql-test/main/cte_recursive.test +++ b/mysql-test/main/cte_recursive.test @@ -3645,7 +3645,7 @@ select * from cte; # one non-recursive CTEs with name x uses table t1, the second CTE x is # recursive and is in the scope of the first one, but does not use it; # CTE cte uses only the second CTE with name x; -# the query has two refeences to cte_e +# the query has two references to cte_e # before fix of this bug: infinite sequence of recursive calls with @@ -3678,7 +3678,7 @@ cte_e as select s1.*, s2.* from cte_e as s1, cte_e as s2; -# check : with base table x all queries abobe that returned error +# check : with base table x all queries above that returned error # message ER_NO_SUCH_TABLE now return proper result sets with diff --git a/mysql-test/main/ctype_latin1.test b/mysql-test/main/ctype_latin1.test index 00f43553075..431511e40d8 100644 --- a/mysql-test/main/ctype_latin1.test +++ b/mysql-test/main/ctype_latin1.test @@ -97,7 +97,7 @@ SET collation_connection='latin1_bin'; # Bug#8041 # An unknown character (e.g. 0x84) should result in ERROR, # It was treated like a space character earlier. -# Howerver, it should still work fine as a string part. +# However, it should still work fine as a string part. --error 1064 CREATE TABLE „a (a int); SELECT '„a' as str; diff --git a/mysql-test/main/ctype_recoding.test b/mysql-test/main/ctype_recoding.test index 5c25d854137..b1db9b5cf53 100644 --- a/mysql-test/main/ctype_recoding.test +++ b/mysql-test/main/ctype_recoding.test @@ -117,7 +117,7 @@ DROP TABLE t1; # -# Test that we allow only well-formed UTF8 identitiers +# Test that we allow only well-formed UTF8 identifiers # SET NAMES binary; --error 1300 @@ -128,7 +128,7 @@ CREATE TABLE `good # -# Test that we produce a warnign when conversion loses data. +# Test that we produce a warning when conversion loses data. # set names latin1; create table t1 (a char(10) character set koi8r, b text character set koi8r); @@ -150,7 +150,7 @@ insert into t1 values (_koi8r' select * from t1 where a=_koi8r'×ÁÓÑ'; # this is possible, because we have a function with constant arguments: select * from t1 where a=concat(_koi8r'×ÁÓÑ'); -# this is not posible, cannot convert _latin1'×ÁÓÑ' into cp1251: +# this is not possible, cannot convert _latin1'×ÁÓÑ' into cp1251: --error 1267 select * from t1 where a=_latin1'×ÁÓÑ'; drop table t1; diff --git a/mysql-test/main/ctype_utf16.test b/mysql-test/main/ctype_utf16.test index 3fb52541845..2a9757f145e 100644 --- a/mysql-test/main/ctype_utf16.test +++ b/mysql-test/main/ctype_utf16.test @@ -683,7 +683,7 @@ show create table t1; drop table t1; # -# Testing that maximim possible key length is 1000 bytes +# Testing that maximum possible key length is 1000 bytes # create table t1 (a varchar(250) character set utf16 primary key); show create table t1; diff --git a/mysql-test/main/ctype_utf16le.result b/mysql-test/main/ctype_utf16le.result index c83610dcafa..bbbb012ced0 100644 --- a/mysql-test/main/ctype_utf16le.result +++ b/mysql-test/main/ctype_utf16le.result @@ -1559,7 +1559,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci DROP TABLE t1; # -# Testing that maximim possible key length is 1000 bytes +# Testing that maximum possible key length is 1000 bytes # CREATE TABLE t1 (a VARCHAR(250) CHARACTER SET utf16le PRIMARY KEY); SHOW CREATE TABLE t1; diff --git a/mysql-test/main/ctype_utf16le.test b/mysql-test/main/ctype_utf16le.test index 5b8e8f22e5d..a3b501931a8 100644 --- a/mysql-test/main/ctype_utf16le.test +++ b/mysql-test/main/ctype_utf16le.test @@ -648,7 +648,7 @@ DROP TABLE t1; --echo # ---echo # Testing that maximim possible key length is 1000 bytes +--echo # Testing that maximum possible key length is 1000 bytes --echo # CREATE TABLE t1 (a VARCHAR(250) CHARACTER SET utf16le PRIMARY KEY); SHOW CREATE TABLE t1; diff --git a/mysql-test/main/ctype_utf32.result b/mysql-test/main/ctype_utf32.result index 6ba7879014f..ae80b27abe8 100644 --- a/mysql-test/main/ctype_utf32.result +++ b/mysql-test/main/ctype_utf32.result @@ -998,7 +998,7 @@ Wrong character with pad insert ignore into t1 values (0x110000); Warnings: Warning 1366 Incorrect string value: '\x11\x00\x00' for column `test`.`t1`.`utf32` at row 1 -Wrong chsaracter without pad +Wrong character without pad insert ignore into t1 values (0x00110000); Warnings: Warning 1366 Incorrect string value: '\x00\x11\x00\x00' for column `test`.`t1`.`utf32` at row 1 diff --git a/mysql-test/main/ctype_utf32.test b/mysql-test/main/ctype_utf32.test index e358013b1c7..dfab164365d 100644 --- a/mysql-test/main/ctype_utf32.test +++ b/mysql-test/main/ctype_utf32.test @@ -600,7 +600,7 @@ drop table t1; create table t1 (utf32 varchar(2) character set utf32); --echo Wrong character with pad insert ignore into t1 values (0x110000); ---echo Wrong chsaracter without pad +--echo Wrong character without pad insert ignore into t1 values (0x00110000); --echo Wrong character with pad followed by another wrong character insert ignore into t1 values (0x11000000110000); @@ -724,7 +724,7 @@ show create table t1; drop table t1; # -# Testing that maximim possible key length is 1332 bytes +# Testing that maximum possible key length is 1332 bytes # create table t1 (a varchar(250) character set utf32 primary key); show create table t1; diff --git a/mysql-test/main/ctype_utf8.test b/mysql-test/main/ctype_utf8.test index 19847e430ec..e6b43cd45bc 100644 --- a/mysql-test/main/ctype_utf8.test +++ b/mysql-test/main/ctype_utf8.test @@ -2003,7 +2003,7 @@ DROP PROCEDURE p1; SET @@SQL_MODE=default; -# TODO: Uncomment the below test whe we fix: +# TODO: Uncomment the below test when we fix it: # MDEV-9623INFORMATION_SCHEMA.ROUTINES.ROUTINE_DEFINITION does not handle binary literals well # #SET NAMES binary; diff --git a/mysql-test/main/custom_aggregate_functions.test b/mysql-test/main/custom_aggregate_functions.test index a6097b37847..cf103264569 100644 --- a/mysql-test/main/custom_aggregate_functions.test +++ b/mysql-test/main/custom_aggregate_functions.test @@ -478,7 +478,7 @@ select val, id, c from (select f1(sal) as c from t2) as t1, t2; --sorted_result select f1(sal),f1(val), f1(id), f1(sal) from t2; -#string type, also more than one areguments +#string type, also more than one argument --sorted_result select f4(sal, val) from t1; diff --git a/mysql-test/main/custom_aggregates_i_s.result b/mysql-test/main/custom_aggregates_i_s.result index 2a19e9f7cab..773377fbdd9 100644 --- a/mysql-test/main/custom_aggregates_i_s.result +++ b/mysql-test/main/custom_aggregates_i_s.result @@ -69,7 +69,7 @@ id select_type table type possible_keys key key_len ref rows Extra show status like "%custom_aggregate%"; Variable_name Value Feature_custom_aggregate_functions 5 -custom aggregates inside other customm aggregates +custom aggregates inside other custom aggregates explain select f2(sal) from t1; id select_type table type possible_keys key key_len ref rows Extra diff --git a/mysql-test/main/custom_aggregates_i_s.test b/mysql-test/main/custom_aggregates_i_s.test index adcaedc3a68..dd5eb50d82c 100644 --- a/mysql-test/main/custom_aggregates_i_s.test +++ b/mysql-test/main/custom_aggregates_i_s.test @@ -61,7 +61,7 @@ explain select (select f1(sal) as a from t3 where t3.id= t1.id ) from t1 ; show status like "%custom_aggregate%"; ---echo custom aggregates inside other customm aggregates +--echo custom aggregates inside other custom aggregates explain select f2(sal) from t1; diff --git a/mysql-test/main/default.result b/mysql-test/main/default.result index 7234001fcf0..050c5cb2af3 100644 --- a/mysql-test/main/default.result +++ b/mysql-test/main/default.result @@ -437,7 +437,7 @@ ERROR 01000: Expression for field `a` is referring to uninitialized field `b` show create table t1; ERROR 42S02: Table 'test.t1' doesn't exist # -# Refering to other columns +# Referring to other columns # create or replace table t1 (a int default 1, b int default a); create or replace table t1 (a int default 1, b int as (a)); @@ -3219,7 +3219,7 @@ a b 6 7 drop table t1; # -# DEVAULT & PS adoption +# DEFAULT & PS adoption # CREATE TABLE t1 (a INT DEFAULT 10, b INT DEFAULT NULL); EXECUTE IMMEDIATE 'INSERT INTO t1 VALUES (?,?)' USING IGNORE, IGNORE; diff --git a/mysql-test/main/default.test b/mysql-test/main/default.test index af770500145..7c4497f5937 100644 --- a/mysql-test/main/default.test +++ b/mysql-test/main/default.test @@ -320,7 +320,7 @@ create or replace table t1 (a int default b, b int default a); show create table t1; --echo # ---echo # Refering to other columns +--echo # Referring to other columns --echo # create or replace table t1 (a int default 1, b int default a); @@ -1923,7 +1923,7 @@ INSERT INTO t2 VALUES (1),(2),(3),(2); INSERT INTO t1 SELECT a FROM t2 ON DUPLICATE KEY UPDATE a=DEFAULT; SELECT * FROM t1 order by a; truncate table t1; -# efectively it is DEFALT +# effectively it is DEFAULT INSERT INTO t1 SELECT a FROM t2 ON DUPLICATE KEY UPDATE a=IGNORE; SELECT * FROM t1 order by a; DROP TABLE t1,t2; @@ -1949,7 +1949,7 @@ select * from t1 order by a; drop table t1; --echo # ---echo # DEVAULT & PS adoption +--echo # DEFAULT & PS adoption --echo # diff --git a/mysql-test/main/delete.result b/mysql-test/main/delete.result index 1e841aaf835..ee1f00729d8 100644 --- a/mysql-test/main/delete.result +++ b/mysql-test/main/delete.result @@ -697,7 +697,7 @@ DELETE t2.* FROM t2 use index(xid) ORDER BY (id) DESC LIMIT 3; select * from t2; id 3 -# Check some useles syntax +# Check some useless syntax DELETE t2.* FROM t2 FORCE INDEX FOR GROUP BY (xid) ORDER BY (id) LIMIT 1; drop table t2; # Check that hints work with limit @@ -770,7 +770,7 @@ explain DELETE FROM t2 ignore index(primary) ORDER BY (id) LIMIT 2; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t2 index NULL xid 4 NULL 2 -# should issue warnings becaouse we can not switch it internally +# should issue warnings because we can not switch it internally # to multiupdate due to RETURNING DELETE FROM t2 ignore index(primary) ORDER BY (id) LIMIT 2 RETURNING id; id diff --git a/mysql-test/main/delete.test b/mysql-test/main/delete.test index d747481961e..c6534f55f49 100644 --- a/mysql-test/main/delete.test +++ b/mysql-test/main/delete.test @@ -758,7 +758,7 @@ DELETE t2.* FROM t2 use index(xid) ORDER BY (id) LIMIT 2; select * from t2 ORDER BY (id); DELETE t2.* FROM t2 use index(xid) ORDER BY (id) DESC LIMIT 3; select * from t2; ---echo # Check some useles syntax +--echo # Check some useless syntax DELETE t2.* FROM t2 FORCE INDEX FOR GROUP BY (xid) ORDER BY (id) LIMIT 1; drop table t2; @@ -819,7 +819,7 @@ DELETE FROM t2 force index(xid) ORDER BY (id) LIMIT 2; explain DELETE FROM t2 ignore index(primary) ORDER BY (id) LIMIT 2; ---echo # should issue warnings becaouse we can not switch it internally +--echo # should issue warnings because we can not switch it internally --echo # to multiupdate due to RETURNING DELETE FROM t2 ignore index(primary) ORDER BY (id) LIMIT 2 RETURNING id; diff --git a/mysql-test/main/delete_use_source.result b/mysql-test/main/delete_use_source.result index 8ec8dce2c2f..608d20b383d 100644 --- a/mysql-test/main/delete_use_source.result +++ b/mysql-test/main/delete_use_source.result @@ -10,7 +10,7 @@ Table Op Msg_type Msg_text test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK # -# Delete with limit (quick select - range acces) +# Delete with limit (quick select - range access) # start transaction; delete from t1 where (select count(*) from t1 b where b.c1=t1.c1) = 500 limit 1; diff --git a/mysql-test/main/delete_use_source.test b/mysql-test/main/delete_use_source.test index 75bce4956fc..98468711ccf 100644 --- a/mysql-test/main/delete_use_source.test +++ b/mysql-test/main/delete_use_source.test @@ -13,7 +13,7 @@ insert t1 select 3,seq from seq_1_to_20; analyze table t1; --echo # ---echo # Delete with limit (quick select - range acces) +--echo # Delete with limit (quick select - range access) --echo # --disable_view_protocol diff --git a/mysql-test/main/derived_split_innodb.test b/mysql-test/main/derived_split_innodb.test index b4d37290d14..10e10b0c236 100644 --- a/mysql-test/main/derived_split_innodb.test +++ b/mysql-test/main/derived_split_innodb.test @@ -552,7 +552,7 @@ eval $tvc_conversion_threshold EXPLAIN $query; let $no_split_materialized_loosescan= set statement optimizer_switch='split_materialized=off, loosescan=off' for; -# Correct result with split materializied optimization disabled +# Correct result with split materialized optimization disabled eval $no_split_materialized_loosescan $tvc_conversion_threshold $query; diff --git a/mysql-test/main/distinct.test b/mysql-test/main/distinct.test index c0c9439822a..d51e5093f24 100644 --- a/mysql-test/main/distinct.test +++ b/mysql-test/main/distinct.test @@ -587,7 +587,7 @@ DROP TABLE t1; SET @old_max_heap_table_size = @@max_heap_table_size; SET @@max_heap_table_size = 16384; -# Set sort_buffer_size to the mininum value so that remove_duplicates() calls +# Set sort_buffer_size to the minimum value so that remove_duplicates() calls # remove_dup_with_compare() SET @old_sort_buffer_size = @@sort_buffer_size; SET @@sort_buffer_size = 32804; diff --git a/mysql-test/main/drop_table_force.test b/mysql-test/main/drop_table_force.test index 04ebb997b80..4a5fafc1e2a 100644 --- a/mysql-test/main/drop_table_force.test +++ b/mysql-test/main/drop_table_force.test @@ -2,11 +2,11 @@ --source include/have_innodb.inc --source include/have_archive.inc # -# This test is based on the orginal test from Tencent for DROP TABLE ... FORCE +# This test is based on the original test from Tencent for DROP TABLE ... FORCE # In MariaDB we did reuse the code but MariaDB does not require the FORCE # keyword to drop a table even if the .frm file or some engine files are # missing. -# To make it easy to see the differences between the orginal code and +# To make it easy to see the differences between the original code and # the new one, we have left some references to the original test case # diff --git a/mysql-test/main/failed_auth_3909.test b/mysql-test/main/failed_auth_3909.test index af65f46cfa2..43ee85416ce 100644 --- a/mysql-test/main/failed_auth_3909.test +++ b/mysql-test/main/failed_auth_3909.test @@ -3,7 +3,7 @@ source include/not_embedded.inc; # # MDEV-3909 remote user enumeration # -# verify that for some failed login attemps (with wrong user names) +# verify that for some failed login attempts (with wrong user names) # the server requests a plugin # create user foo identified via mysql_old_password; diff --git a/mysql-test/main/flush.test b/mysql-test/main/flush.test index 887c48ef018..1085b469a03 100644 --- a/mysql-test/main/flush.test +++ b/mysql-test/main/flush.test @@ -103,7 +103,7 @@ drop table t1, t2, t3; # # Test of deadlock problem when doing FLUSH TABLE with read lock # (Bug was in NTPL threads in Linux when using different mutex while -# waiting for a condtion variable) +# waiting for a condition variable) create table t1 (c1 int); create table t2 (c1 int); diff --git a/mysql-test/main/flush_read_lock.result b/mysql-test/main/flush_read_lock.result index 72ae769c0e9..a8f8431e125 100644 --- a/mysql-test/main/flush_read_lock.result +++ b/mysql-test/main/flush_read_lock.result @@ -23,8 +23,8 @@ set local sql_mode=""; # ALTER TABLE, ANALYZE, OPTIMIZE and some others always # issue an implicit commit, even if its argument is a # temporary table. -# *Howewer* an implicit commit is a no-op if all engines -# used since the start of transactiona are non- +# *However* an implicit commit is a no-op if all engines +# used since the start of transaction are non- # transactional. Thus, for non-transactional engines, # these operations are not blocked by FTWRL. # This is class #3 -- compatible because do not take @@ -1463,7 +1463,7 @@ set debug_sync= "RESET"; # such changes are considered read only [sic!/QQ] this commit # is compatible with FTWRL. # -# Let us demostrate this fact for some common DML statements. +# Let us demonstrate this fact for some common DML statements. Success: Was able to run 'delete from t3_temp_trans' under FTWRL. Success: Was able to run 'delete from t3_temp_trans' with FTWRL active in another connection. Success: Was able to run FTWRL while 'delete from t3_temp_trans' was active in another connection. @@ -1654,7 +1654,7 @@ set debug_sync= "RESET"; delete from t1_base; delete from t2_base; -# Check that COMMIT thas is issued after +# Check that COMMIT that is issued after # FLUSH TABLES WITH READ LOCK is not blocked by # FLUSH TABLES WITH READ LOCK from another connection. # This scenario is used in innobackup.pl. The COMMIT goes diff --git a/mysql-test/main/flush_read_lock.test b/mysql-test/main/flush_read_lock.test index 3f8bde09bef..358f020d4bc 100644 --- a/mysql-test/main/flush_read_lock.test +++ b/mysql-test/main/flush_read_lock.test @@ -38,8 +38,8 @@ set local sql_mode=""; --echo # ALTER TABLE, ANALYZE, OPTIMIZE and some others always --echo # issue an implicit commit, even if its argument is a --echo # temporary table. ---echo # *Howewer* an implicit commit is a no-op if all engines ---echo # used since the start of transactiona are non- +--echo # *However* an implicit commit is a no-op if all engines +--echo # used since the start of transaction are non- --echo # transactional. Thus, for non-transactional engines, --echo # these operations are not blocked by FTWRL. --echo # This is class #3 -- compatible because do not take @@ -1802,7 +1802,7 @@ set debug_sync= "RESET"; --echo # such changes are considered read only [sic!/QQ] this commit --echo # is compatible with FTWRL. --echo # ---echo # Let us demostrate this fact for some common DML statements. +--echo # Let us demonstrate this fact for some common DML statements. let $statement= delete from t3_temp_trans; let $cleanup_stmt= ; --source include/check_ftwrl_compatible.inc @@ -2031,7 +2031,7 @@ delete from t1_base; delete from t2_base; --echo ---echo # Check that COMMIT thas is issued after +--echo # Check that COMMIT that is issued after --echo # FLUSH TABLES WITH READ LOCK is not blocked by --echo # FLUSH TABLES WITH READ LOCK from another connection. --echo # This scenario is used in innobackup.pl. The COMMIT goes diff --git a/mysql-test/main/flush_ssl.test b/mysql-test/main/flush_ssl.test index c8be2896815..cabfed3bd3f 100644 --- a/mysql-test/main/flush_ssl.test +++ b/mysql-test/main/flush_ssl.test @@ -55,7 +55,7 @@ SELECT VARIABLE_NAME NAME, VARIABLE_VALUE VALUE FROM INFORMATION_SCHEMA.GLOBAL_S --echo # Cleanup remove_file $ssl_cert; remove_file $ssl_key; -# restart with usuall SSL +# restart with usual SSL let $restart_parameters=; --source include/kill_mysqld.inc --source include/start_mysqld.inc diff --git a/mysql-test/main/func_encrypt_nossl.test b/mysql-test/main/func_encrypt_nossl.test index fbaffe7850c..a9718a1644a 100644 --- a/mysql-test/main/func_encrypt_nossl.test +++ b/mysql-test/main/func_encrypt_nossl.test @@ -2,7 +2,7 @@ # # Test output from des_encrypt and des_decrypt when server is -# compiled without openssl suuport +# compiled without openssl support # select des_encrypt("test", 'akeystr'); select des_encrypt("test", 1); diff --git a/mysql-test/main/func_group.result b/mysql-test/main/func_group.result index 838f8836f22..b669f44b4e3 100644 --- a/mysql-test/main/func_group.result +++ b/mysql-test/main/func_group.result @@ -1516,7 +1516,7 @@ ORDER BY max; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 3 -# Only 11 is correct for collumn i in this result +# Only 11 is correct for column i in this result SELECT MAX(pk) as max, i FROM t1 WHERE pk<2 diff --git a/mysql-test/main/func_group.test b/mysql-test/main/func_group.test index ba0ebbfd8cf..4cfeb46f368 100644 --- a/mysql-test/main/func_group.test +++ b/mysql-test/main/func_group.test @@ -435,7 +435,7 @@ drop table t1; # -# cleunup() of optimized away count(*) and max/min +# cleanup() of optimized away count(*) and max/min # create table t1 (a int); insert into t1 values (1),(2); @@ -1055,7 +1055,7 @@ FROM t1 ORDER BY max; --echo ---echo # Only 11 is correct for collumn i in this result +--echo # Only 11 is correct for column i in this result SELECT MAX(pk) as max, i FROM t1 WHERE pk<2 diff --git a/mysql-test/main/func_hybrid_type.result b/mysql-test/main/func_hybrid_type.result index dd9774cd24b..72bb77bca98 100644 --- a/mysql-test/main/func_hybrid_type.result +++ b/mysql-test/main/func_hybrid_type.result @@ -4245,7 +4245,7 @@ ERROR HY000: Illegal parameter data types bigint unsigned and row for operation SELECT (b+b)=ROW(1,1) FROM t1; ERROR HY000: Illegal parameter data types bigint and row for operation '=' DROP TABLE t1; -# Opetator + for different types integer types, with the UNSIGNED flag +# Operator + for different types integer types, with the UNSIGNED flag CREATE TABLE t1 (a1 TINYINT UNSIGNED, a2 SMALLINT UNSIGNED); SELECT (a1+a2)=ROW(1,1) FROM t1; ERROR HY000: Illegal parameter data types int unsigned and row for operation '=' diff --git a/mysql-test/main/func_hybrid_type.test b/mysql-test/main/func_hybrid_type.test index e1e347b115f..5af1fb05dbb 100644 --- a/mysql-test/main/func_hybrid_type.test +++ b/mysql-test/main/func_hybrid_type.test @@ -1023,7 +1023,7 @@ SELECT (b+b)=ROW(1,1) FROM t1; DROP TABLE t1; ---echo # Opetator + for different types integer types, with the UNSIGNED flag +--echo # Operator + for different types integer types, with the UNSIGNED flag CREATE TABLE t1 (a1 TINYINT UNSIGNED, a2 SMALLINT UNSIGNED); --error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION diff --git a/mysql-test/main/func_json.result b/mysql-test/main/func_json.result index 2037b701c6d..6529704ccd8 100644 --- a/mysql-test/main/func_json.result +++ b/mysql-test/main/func_json.result @@ -3987,7 +3987,7 @@ JSON_SCHEMA_VALID(@object_schema, '{"key1":"val1", "key2": 10, "I_int":20, "S_": SELECT JSON_SCHEMA_VALID(@object_schema, '{"key1":"val1", "key2": 10, "I_int":[1,2,3], "S_":[1,2,3], "some_prop1":[1,2,3]}'); JSON_SCHEMA_VALID(@object_schema, '{"key1":"val1", "key2": 10, "I_int":[1,2,3], "S_":[1,2,3], "some_prop1":[1,2,3]}') 1 -# Remvoing additionalProperties to check that validation falls back on unevaluatedProperties +# Removing additionalProperties to check that validation falls back on unevaluatedProperties SET @object_schema= '{ "type":"object", "properties": { diff --git a/mysql-test/main/func_json.test b/mysql-test/main/func_json.test index 16a7a578e36..71770bd02b1 100644 --- a/mysql-test/main/func_json.test +++ b/mysql-test/main/func_json.test @@ -3053,7 +3053,7 @@ SET @object_schema= '{ SELECT JSON_SCHEMA_VALID(@object_schema, '{"key1":"val1", "key2": 10, "I_int":20, "S_":"abc", "some_prop1":[1,2,3]}'); SELECT JSON_SCHEMA_VALID(@object_schema, '{"key1":"val1", "key2": 10, "I_int":[1,2,3], "S_":[1,2,3], "some_prop1":[1,2,3]}'); ---echo # Remvoing additionalProperties to check that validation falls back on unevaluatedProperties +--echo # Removing additionalProperties to check that validation falls back on unevaluatedProperties SET @object_schema= '{ "type":"object", diff --git a/mysql-test/main/func_regexp_pcre.result b/mysql-test/main/func_regexp_pcre.result index 4416dfc4ccf..cbf921293f4 100644 --- a/mysql-test/main/func_regexp_pcre.result +++ b/mysql-test/main/func_regexp_pcre.result @@ -846,7 +846,7 @@ Warning 1139 Regex error 'UTF-8 error: 1 byte missing at end' # Since 11.5 (MDEV-25829) user variables have DERIVATION_COERCIBLE # so a user variable and a literal in the pattern gave equal results # But since 11.6 (MDEV-35041) user variables have DERIVATION_USERVAR -# so the query with a literal is performece as binary: +# so the query with a literal is performed as binary: SELECT 0xE001 REGEXP '\\xE0\\x01' AS c1; c1 1 @@ -870,7 +870,7 @@ SET @regCheck= _binary '\\xE0\\x01'; SELECT 0xE001 REGEXP @regCheck; 0xE001 REGEXP @regCheck 1 -# Testing workarond N3: This makes derivation of the subject string stronger (IMLICIT instead of COERCIBLE) +# Testing workaround N3: This makes derivation of the subject string stronger (IMLICIT instead of COERCIBLE) SET NAMES latin1; SET @regCheck= '\\xE0\\x01'; SELECT CAST(0xE001 AS BINARY) REGEXP @regCheck; diff --git a/mysql-test/main/func_regexp_pcre.test b/mysql-test/main/func_regexp_pcre.test index f214ee6db07..1c89112ee8f 100644 --- a/mysql-test/main/func_regexp_pcre.test +++ b/mysql-test/main/func_regexp_pcre.test @@ -196,7 +196,7 @@ SELECT REGEXP_REPLACE('a5b ab a5b','(?<=a)5*(?=b)','x'); SELECT REGEXP_REPLACE('a5b a5b a5b','(?<=a)5*(?=b)','x'); -# Check that case sensitiviry respects the collation +# Check that case sensitivity respects the collation SELECT REGEXP_REPLACE('A','a','b'); SELECT REGEXP_REPLACE('a','A','b'); SELECT REGEXP_REPLACE('A' COLLATE utf8_bin,'a','b'); @@ -423,7 +423,7 @@ SELECT 0xE001 REGEXP CAST(@regCheck AS CHAR); --echo # Since 11.5 (MDEV-25829) user variables have DERIVATION_COERCIBLE --echo # so a user variable and a literal in the pattern gave equal results --echo # But since 11.6 (MDEV-35041) user variables have DERIVATION_USERVAR ---echo # so the query with a literal is performece as binary: +--echo # so the query with a literal is performed as binary: SELECT 0xE001 REGEXP '\\xE0\\x01' AS c1; --echo # while the query with a user variable is performed as string @@ -441,7 +441,7 @@ SET NAMES latin1; SET @regCheck= _binary '\\xE0\\x01'; SELECT 0xE001 REGEXP @regCheck; ---echo # Testing workarond N3: This makes derivation of the subject string stronger (IMLICIT instead of COERCIBLE) +--echo # Testing workaround N3: This makes derivation of the subject string stronger (IMLICIT instead of COERCIBLE) SET NAMES latin1; SET @regCheck= '\\xE0\\x01'; SELECT CAST(0xE001 AS BINARY) REGEXP @regCheck; diff --git a/mysql-test/main/func_str.test b/mysql-test/main/func_str.test index c8060961c3d..11fbac20136 100644 --- a/mysql-test/main/func_str.test +++ b/mysql-test/main/func_str.test @@ -95,7 +95,7 @@ SELECT CONCAT('"',CONCAT_WS('";"',repeat('a',60),repeat('b',60),repeat('c',60),r select insert('txs',2,1,'hi'),insert('is ',4,0,'a'),insert('txxxxt',2,4,'es'); select replace('aaaa','a','b'),replace('aaaa','aa','b'),replace('aaaa','a','bb'),replace('aaaa','','b'),replace('bbbb','a','c'); --disable_view_protocol -#chaeck after fix MDEV-31540 +#check after fix MDEV-31540 --disable_cursor_protocol --enable_metadata select replace('aaaa','a','bbbb'); @@ -463,7 +463,7 @@ select charset(a), collation(a), coercibility(a) from t1; drop table t1; select charset(null), collation(null), coercibility(null); # -# Make sure OUTER JOIN is not replaced with a regular joun +# Make sure OUTER JOIN is not replaced with a regular join # CREATE TABLE t1 (a int, b int); CREATE TABLE t2 (a int, b int); @@ -490,7 +490,7 @@ select SUBSTR('abcdefg',1,-1) FROM DUAL; # # Test that fix_fields doesn't follow to upper level (to comparison) -# when an error on a lower level (in concat) has accured: +# when an error on a lower level (in concat) has occured: # create table t7 (s1 char); --error 1267 @@ -1627,7 +1627,7 @@ SELECT format(12345678901234567890.123, 3, 'en_US'); --enable_cursor_protocol SELECT format(12345678901234567890.123, 3, 'it_CH'); SELECT format(12345678901234567890.123, 3, 'ru_RU'); -#checkafter fix MDEV-31512 +#check after fix MDEV-31512 --disable_cursor_protocol SELECT format(12345678901234567890.123, 3, 'ta_IN'); --enable_cursor_protocol diff --git a/mysql-test/main/func_time.result b/mysql-test/main/func_time.result index 2296abf2d1c..65c40debf03 100644 --- a/mysql-test/main/func_time.result +++ b/mysql-test/main/func_time.result @@ -6031,7 +6031,7 @@ SELECT ADDTIME(TIME'-838:59:59.9999999', '87649416:59:59') AS c7; c7 NULL # HOUR is max_useful_hour() (inside INTERVAL DAY TO SECOND range) -# Expect max TIME(0) + zero fraction + TIME warnings + no INTEVAL warnings +# Expect max TIME(0) + zero fraction + TIME warnings + no INTERVAL warnings SELECT ADDTIME(TIME'00:00:00', 876494155959) AS ci, ADDTIME(TIME'00:00:00', 876494155959)+0 AS c0, diff --git a/mysql-test/main/func_time.test b/mysql-test/main/func_time.test index fcd38e51fca..ba7c4c09eb0 100644 --- a/mysql-test/main/func_time.test +++ b/mysql-test/main/func_time.test @@ -301,7 +301,7 @@ select unix_timestamp('2038-01-17 12:00:00'); # # Check positive shift. (it happens only on -# platfroms with unsigned time_t, such as QNX) +# platforms with unsigned time_t, such as QNX) # select unix_timestamp('1970-01-01 03:00:01'); @@ -3078,7 +3078,7 @@ SELECT --enable_warnings --echo # HOUR is max_useful_hour() (inside INTERVAL DAY TO SECOND range) ---echo # Expect max TIME(0) + zero fraction + TIME warnings + no INTEVAL warnings +--echo # Expect max TIME(0) + zero fraction + TIME warnings + no INTERVAL warnings SELECT ADDTIME(TIME'00:00:00', 876494155959) AS ci, ADDTIME(TIME'00:00:00', 876494155959)+0 AS c0, diff --git a/mysql-test/main/gis.test b/mysql-test/main/gis.test index 823dfb63f6a..94528439b49 100644 --- a/mysql-test/main/gis.test +++ b/mysql-test/main/gis.test @@ -777,7 +777,7 @@ SET @a=POLYFROMWKB(@a); # #The SELECT statement cannot contain a subquery in the FROM clause -#fore --view-protocol +#for --view-protocol --disable_view_protocol create table t1(a geometry NOT NULL)engine=myisam; insert into t1 values (geomfromtext("point(0 1)")); diff --git a/mysql-test/main/grant.test b/mysql-test/main/grant.test index 3779047124a..0aafc43601b 100644 --- a/mysql-test/main/grant.test +++ b/mysql-test/main/grant.test @@ -87,7 +87,7 @@ flush privileges; show grants for mysqltest_1@localhost; # -# Test what happens when you have same table and colum level grants +# Test what happens when you have same table and column level grants # create table t1 (a int); @@ -1531,7 +1531,7 @@ create table t4 (i INT); connection default; grant select, insert on mysqltest.t2 to mysqltest@localhost; grant insert on mysqltest.t4 to mysqltest@localhost; -# to specify ACLs for non-existent objects, must explictly |CREATE +# to specify ACLs for non-existent objects, must explicitly |CREATE grant create, insert on mysqltest.t5 to mysqltest@localhost; grant create, insert on mysqltest.t6 to mysqltest@localhost; flush privileges; diff --git a/mysql-test/main/grant_slave_monitor.test b/mysql-test/main/grant_slave_monitor.test index 1be9b7e944d..367fc1c47f9 100644 --- a/mysql-test/main/grant_slave_monitor.test +++ b/mysql-test/main/grant_slave_monitor.test @@ -8,11 +8,11 @@ # # Step1: GRANT ALL privileges for a new user 'user1' and then REVOKE # SLAVE MONITOR privileges. -# Step2: Execute SHOW SLAVE STAUTS/SHOW RELAYLOG EVENTS commands and expect +# Step2: Execute SHOW SLAVE STATUS/SHOW RELAYLOG EVENTS commands and expect # ER_SPECIFIC_ACCESS_DENIED_ERROR. This also verifies that REPLICATION # SLAVE ADMIN privilege is not required for these two commands. # Step3: GRANT SLAVE MONITOR privilege and observe that both commands are -# allowd to execute. +# allowed to execute. # # ==== References ==== # diff --git a/mysql-test/main/greedy_optimizer.result b/mysql-test/main/greedy_optimizer.result index a7667f8ccbe..f0aee6cb676 100644 --- a/mysql-test/main/greedy_optimizer.result +++ b/mysql-test/main/greedy_optimizer.result @@ -1313,7 +1313,7 @@ COUNT(*) # plans without restricting 'optimizer_search_depth'. # Fix problems like those reported as bug#41740 & bug#58225. # -# EPLAIN of queries using T1-T62 will timeout/hang wo/ fixes +# EXPLAIN of queries using T1-T62 will timeout/hang wo/ fixes # DROP TABLE t10, t10000; CREATE TABLE t1 ( K INT NOT NULL AUTO_INCREMENT, diff --git a/mysql-test/main/greedy_optimizer.test b/mysql-test/main/greedy_optimizer.test index 524fb4ffde2..34b5a571682 100644 --- a/mysql-test/main/greedy_optimizer.test +++ b/mysql-test/main/greedy_optimizer.test @@ -2,7 +2,7 @@ # # A simple test of the greedy query optimization algorithm and the switches that -# control the optimizationprocess. +# controls the optimization process. # # @@ -140,7 +140,7 @@ insert into t7 values (21,2,3,4,5,6); # The actual test begins here # -# This value swithes back to the old implementation of 'find_best()' +# This value switches back to the old implementation of 'find_best()' # set optimizer_search_depth=63; - old (independent of the optimizer_prune_level) # # These are the values for the parameters that control the greedy optimizer @@ -729,7 +729,7 @@ WHERE x.k=t10.i --echo # plans without restricting 'optimizer_search_depth'. --echo # Fix problems like those reported as bug#41740 & bug#58225. --echo # ---echo # EPLAIN of queries using T1-T62 will timeout/hang wo/ fixes +--echo # EXPLAIN of queries using T1-T62 will timeout/hang wo/ fixes --echo # DROP TABLE t10, t10000; diff --git a/mysql-test/main/group_min_max.result b/mysql-test/main/group_min_max.result index 14efe4eeb5e..6859cce1b5c 100644 --- a/mysql-test/main/group_min_max.result +++ b/mysql-test/main/group_min_max.result @@ -2134,7 +2134,7 @@ Warnings: Note 1003 select sum(ord(`test`.`t1`.`a1`)) AS `sum(ord(a1))` from `test`.`t1` where `test`.`t1`.`a1` > 'a' group by `test`.`t1`.`a1`,`test`.`t1`.`a2`,`test`.`t1`.`b` create table t4 as select distinct a1, a2, b, c from t1; alter table t4 add unique index idxt4 (a1, a2, b, c); -# This is "superceded" by MDEV-7118, and Loose Index Scan is again an option: +# This is "superseded" by MDEV-7118, and Loose Index Scan is again an option: explain select a1, a2, b, min(c) from t4 group by a1, a2, b; id select_type table type possible_keys key key_len ref rows Extra diff --git a/mysql-test/main/group_min_max.test b/mysql-test/main/group_min_max.test index 1392bd563fc..8d214ecf92e 100644 --- a/mysql-test/main/group_min_max.test +++ b/mysql-test/main/group_min_max.test @@ -711,7 +711,7 @@ explain extended select sum(ord(a1)) from t1 where (a1 > 'a') group by a1,a2,b; create table t4 as select distinct a1, a2, b, c from t1; alter table t4 add unique index idxt4 (a1, a2, b, c); ---echo # This is "superceded" by MDEV-7118, and Loose Index Scan is again an option: +--echo # This is "superseded" by MDEV-7118, and Loose Index Scan is again an option: explain select a1, a2, b, min(c) from t4 group by a1, a2, b; select a1, a2, b, min(c) from t4 group by a1, a2, b; diff --git a/mysql-test/main/having_cond_pushdown.result b/mysql-test/main/having_cond_pushdown.result index f94fb237bb7..df5cb862d74 100644 --- a/mysql-test/main/having_cond_pushdown.result +++ b/mysql-test/main/having_cond_pushdown.result @@ -2030,7 +2030,7 @@ EXPLAIN } } } -# conjuctive subformula : pushdown using WHERE multiple equalities +# conjunctive subformula : pushdown using WHERE multiple equalities set statement optimizer_switch='condition_pushdown_from_having=off' for SELECT t1.a,MAX(t1.b),t1.c FROM t1 WHERE (t1.a=t1.c) diff --git a/mysql-test/main/having_cond_pushdown.test b/mysql-test/main/having_cond_pushdown.test index 58a05a159cb..2bd2c7cd3dd 100644 --- a/mysql-test/main/having_cond_pushdown.test +++ b/mysql-test/main/having_cond_pushdown.test @@ -445,7 +445,7 @@ HAVING ((t1.a=t1.c) AND (t1.a>1)) OR ((t1.a<3) AND (t1.c>3)); --source include/explain-no-costs.inc eval $no_pushdown explain format=json $query; ---echo # conjuctive subformula : pushdown using WHERE multiple equalities +--echo # conjunctive subformula : pushdown using WHERE multiple equalities let $query= SELECT t1.a,MAX(t1.b),t1.c FROM t1 diff --git a/mysql-test/main/host_cache_size_functionality.test b/mysql-test/main/host_cache_size_functionality.test index f37b2ab8c9e..3f97787248c 100644 --- a/mysql-test/main/host_cache_size_functionality.test +++ b/mysql-test/main/host_cache_size_functionality.test @@ -15,7 +15,7 @@ # * Value Check # # * Scope Check # # * Functionality Check # -# * Accessability Check # +# * Accessibility Check # # # # This test does not perform the crash recovery on this variable # # For crash recovery test on default change please run the ibtest # @@ -125,7 +125,7 @@ SELECT Host_Cache_Size = @@SESSION.Host_Cache_Size; #The below check has been commented out as the IP fetch is different in a P2P connection than BroadBand connection #--echo '#---------------------WL6372_VAR_6_06----------------------#' ############################################################################### -# Checking the Host cahce functionality # +# Checking the Host cache functionality # ############################################################################### #SET @@GLOBAL.Host_Cache_Size=2; diff --git a/mysql-test/main/information_schema_chmod.test b/mysql-test/main/information_schema_chmod.test index 39e2f680bb8..e3723117671 100644 --- a/mysql-test/main/information_schema_chmod.test +++ b/mysql-test/main/information_schema_chmod.test @@ -3,7 +3,7 @@ # information_schema, part2" this test can't be run on Window with our # current test framework. When "chmod -r" is done within cygwin the # MySQL Server can still read the directory. -# Manual testing shows the functionalty to skip unlistable directories +# Manual testing shows the functionality to skip unlistable directories # works on windows # --source include/not_windows.inc diff --git a/mysql-test/main/information_schema_db.test b/mysql-test/main/information_schema_db.test index 8fbc46a9a13..6ae1d00ef13 100644 --- a/mysql-test/main/information_schema_db.test +++ b/mysql-test/main/information_schema_db.test @@ -344,7 +344,7 @@ drop database db; set @old_max_password_errors=@@max_password_errors; set global max_password_errors=2; -# must use replace_regex for case insenstive replacement +# must use replace_regex for case insensitive replacement let $hostname_re= `select concat('/@\'', @@hostname, '\'/@HOSTNAME/i')`; # set the password_last_changed value diff --git a/mysql-test/main/information_schema_tables.result b/mysql-test/main/information_schema_tables.result index a3dd068831c..b0b7c96c0ce 100644 --- a/mysql-test/main/information_schema_tables.result +++ b/mysql-test/main/information_schema_tables.result @@ -37,7 +37,7 @@ DROP VIEW v; DROP VIEW v2; DROP FUNCTION f; # The third test version from the MDEV. -# It failed reliably, and should be deterninistic. +# It failed reliably, and should be deterministic. CREATE FUNCTION f1() RETURNS INT RETURN 1; CREATE VIEW v01 AS SELECT f1(); CREATE VIEW v02 AS SELECT f1(); diff --git a/mysql-test/main/information_schema_tables.test b/mysql-test/main/information_schema_tables.test index ee277276b52..26c61b5209a 100644 --- a/mysql-test/main/information_schema_tables.test +++ b/mysql-test/main/information_schema_tables.test @@ -25,7 +25,7 @@ END LOOP $ --delimiter ; --connection default # Avoid "Prepared statement needs to be re-prepared" -# Note, the code could probably eventually fixed to avoid forcing re-pepare if +# Note, the code could probably eventually be fixed to avoid forcing re-prepare if # the *temporary* instance of Sp_caches (not the permanent one) was invalidated. --disable_ps_protocol --disable_warnings @@ -64,7 +64,7 @@ DROP VIEW v2; DROP FUNCTION f; --echo # The third test version from the MDEV. ---echo # It failed reliably, and should be deterninistic. +--echo # It failed reliably, and should be deterministic. CREATE FUNCTION f1() RETURNS INT RETURN 1; CREATE VIEW v01 AS SELECT f1(); diff --git a/mysql-test/main/information_schema_temp_table.test b/mysql-test/main/information_schema_temp_table.test index b242b7cfcc2..6cce08cdc41 100644 --- a/mysql-test/main/information_schema_temp_table.test +++ b/mysql-test/main/information_schema_temp_table.test @@ -143,7 +143,7 @@ show table status; # The same as before show table status in mysqltest; -# The should show all ables from `test` DB +# This should show all tables from `test` DB --replace_column 12 # 13 # 14 # --horizontal_results show table status in test; diff --git a/mysql-test/main/innodb_ext_key.result b/mysql-test/main/innodb_ext_key.result index 6c07915ab11..73dabc96cc9 100644 --- a/mysql-test/main/innodb_ext_key.result +++ b/mysql-test/main/innodb_ext_key.result @@ -348,7 +348,7 @@ set optimizer_switch=@save_optimizer_switch; # # LP Bug #915291: query using a materialized view # + extended_keys = on -# (valgrinf complains fixed by the patch for bug #914560) +# (valgrind complains fixed by the patch for bug #914560) # SET optimizer_switch = 'derived_with_keys=on'; CREATE TABLE t1 (a varchar(1)) ENGINE=MyISAM; diff --git a/mysql-test/main/innodb_ext_key.test b/mysql-test/main/innodb_ext_key.test index b9ab1636dca..3af7e355cdd 100644 --- a/mysql-test/main/innodb_ext_key.test +++ b/mysql-test/main/innodb_ext_key.test @@ -203,7 +203,7 @@ set optimizer_switch=@save_optimizer_switch; --echo # --echo # LP Bug #915291: query using a materialized view --echo # + extended_keys = on ---echo # (valgrinf complains fixed by the patch for bug #914560) +--echo # (valgrind complains fixed by the patch for bug #914560) --echo # SET optimizer_switch = 'derived_with_keys=on'; diff --git a/mysql-test/main/innodb_mrr_cpk.test b/mysql-test/main/innodb_mrr_cpk.test index c3674c3eda9..413e3fb8c95 100644 --- a/mysql-test/main/innodb_mrr_cpk.test +++ b/mysql-test/main/innodb_mrr_cpk.test @@ -115,7 +115,7 @@ insert into t2 values (11,33), (11,22), (11,11); explain select * from t1, t2 where t1.a=t2.a and t1.b=t2.b; select * from t1, t2 where t1.a=t2.a and t1.b=t2.b; -# Check a real resultset for comaprison: +# Check a real resultset for comparison: set join_cache_level=0; select * from t1, t2 where t1.a=t2.a and t1.b=t2.b; set join_cache_level=6; diff --git a/mysql-test/main/insert.test b/mysql-test/main/insert.test index 9cd0a6ac987..3930280595c 100644 --- a/mysql-test/main/insert.test +++ b/mysql-test/main/insert.test @@ -93,7 +93,7 @@ use test; # Test of wrong values for float data (bug #2082) # -# PS gives sligthly different numbers for max-float/max-double +# PS gives slightly different numbers for max-float/max-double --disable_ps_protocol create table t1(number int auto_increment primary key, original_value varchar(50), f_double double, f_float float, f_double_7_2 double(7,2), f_float_4_3 float (4,3), f_double_u double unsigned, f_float_u float unsigned, f_double_15_1_u double(15,1) unsigned, f_float_3_1_u float (3,1) unsigned); diff --git a/mysql-test/main/insert_select.test b/mysql-test/main/insert_select.test index 0e9bd05a93e..788e0ce7b20 100644 --- a/mysql-test/main/insert_select.test +++ b/mysql-test/main/insert_select.test @@ -176,7 +176,7 @@ select * from t2; drop table t1, t2; # # BUGS #9728 - 'Decreased functionality in "on duplicate key update"' -# #8147 - 'a column proclaimed ambigous in INSERT ... SELECT .. ON +# #8147 - 'a column proclaimed ambiguous in INSERT ... SELECT .. ON # DUPLICATE' # create table t1 (a int unique); @@ -230,7 +230,7 @@ drop table t1,t2; # tables # -#Note: not an exsaustive test : just a check of the code path. +#Note: not an exhaustive test : just a check of the code path. CREATE TABLE t1 (a int PRIMARY KEY); INSERT INTO t1 values (1), (2); diff --git a/mysql-test/main/insert_update.test b/mysql-test/main/insert_update.test index bb56f04c532..ab4fd51286d 100644 --- a/mysql-test/main/insert_update.test +++ b/mysql-test/main/insert_update.test @@ -85,7 +85,7 @@ DROP TABLE t2; # # Bug#9725 - "disapearing query/hang" and "unknown error" with "on duplicate key update" -# INSERT INGORE...UPDATE gives bad error or breaks protocol. +# INSERT IGNORE...UPDATE gives bad error or breaks protocol. # create table t1 (a int not null unique) engine=myisam; insert into t1 values (1),(2); diff --git a/mysql-test/main/join.test b/mysql-test/main/join.test index 695e6d3d296..d64755dc431 100644 --- a/mysql-test/main/join.test +++ b/mysql-test/main/join.test @@ -470,7 +470,7 @@ select * from (t1, t2) join (t3, t4) on (a < y and t2.b < t3.c); select * from (t1 natural join t2) join (t3 natural join t4) on a = y; select * from ((t3 join (t1 join t2 on c > a) on t3.b < t2.a) join t4 on y > t1.c) join t5 on z = t1.b + 3; -# MySQL extension - refererence qualified coalesced columns +# MySQL extension - reference qualified coalesced columns select * from t1 natural join t2 where t1.b > 0; select * from t1 natural join (t4 natural join t5) where t4.y > 7; select * from (t4 natural join t5) natural join t1 where t4.y > 7; diff --git a/mysql-test/main/join_cache.result b/mysql-test/main/join_cache.result index 6350e2e87a7..a436aedbce2 100644 --- a/mysql-test/main/join_cache.result +++ b/mysql-test/main/join_cache.result @@ -5606,7 +5606,7 @@ set @@optimizer_switch=@local_optimizer_switch; drop table t1,t2,t3,t4; # # Bug#50358 - semijoin execution of subquery with outerjoin -# emplying join buffer +# implying join buffer # CREATE TABLE t1 (i int); CREATE TABLE t2 (i int); diff --git a/mysql-test/main/join_cache.test b/mysql-test/main/join_cache.test index 4c01b752b2c..52dc439edb3 100644 --- a/mysql-test/main/join_cache.test +++ b/mysql-test/main/join_cache.test @@ -3662,7 +3662,7 @@ drop table t1,t2,t3,t4; --echo # --echo # Bug#50358 - semijoin execution of subquery with outerjoin ---echo # emplying join buffer +--echo # implying join buffer --echo # CREATE TABLE t1 (i int); @@ -3816,7 +3816,7 @@ DROP table t1,t2,t3; set join_buffer_size=@save_join_buffer_size; # -# --echo switch to use orginal test suite optimizer switch +# --echo switch to use original test suite optimizer switch # set @@optimizer_switch=@org_optimizer_switch,@local_optimizer_switch= @org_optimizer_switch; diff --git a/mysql-test/main/join_cache_notasan.test b/mysql-test/main/join_cache_notasan.test index c2ff670f044..0a6a7dc88a9 100644 --- a/mysql-test/main/join_cache_notasan.test +++ b/mysql-test/main/join_cache_notasan.test @@ -13,7 +13,7 @@ --echo # MDEV-28217 Incorrect Join Execution When Controlling Join Buffer Size --echo # -# This test tries to allocate a too big bufffer, for which ASAN gives an error +# This test tries to allocate a too big buffer, for which ASAN gives an error CREATE TABLE t1 (i int PRIMARY KEY)engine=innodb; INSERT INTO t1 VALUES (1332945389); diff --git a/mysql-test/main/join_outer.result b/mysql-test/main/join_outer.result index 97452bb7a59..b535f7574bd 100644 --- a/mysql-test/main/join_outer.result +++ b/mysql-test/main/join_outer.result @@ -2849,7 +2849,7 @@ Election Voted ElectionID drop table t1, t2; drop view v1; # -# and another contrived example showing a bit of heirarchy +# and another contrived example showing a bit of hierarchy # create table t10 (a int); create table t20 (b int); diff --git a/mysql-test/main/join_outer.test b/mysql-test/main/join_outer.test index 4f3121955b9..87dfdb2570f 100644 --- a/mysql-test/main/join_outer.test +++ b/mysql-test/main/join_outer.test @@ -50,7 +50,7 @@ explain select t1.*,t2.* from t1 left join t2 on t1.a=t2.a where isnull(t2.a)=1; --sorted_result select t1.*,t2.*,t3.a from t1 left join t2 on (t1.a=t2.a) left join t1 as t3 on (t2.a=t3.a); -# The next query should rearange the left joins to get this to work +# The next query should rearrange the left joins to get this to work --error 1054 explain select t1.*,t2.*,t3.a from t1 left join t2 on (t3.a=t2.a) left join t1 as t3 on (t1.a=t3.a); --error 1054 @@ -662,7 +662,7 @@ select straight_join * from t2 right join t1 on t2.a=t1.a; DROP TABLE t0,t1,t2,t3; # -# Test for bug #9017: left join mistakingly converted to inner join +# Test for bug #9017: left join mistakenly converted to inner join # CREATE TABLE t1 (a int PRIMARY KEY, b int); @@ -2375,7 +2375,7 @@ drop table t1, t2; drop view v1; --echo # ---echo # and another contrived example showing a bit of heirarchy +--echo # and another contrived example showing a bit of hierarchy --echo # create table t10 (a int); create table t20 (b int); diff --git a/mysql-test/main/join_outer_jcl6.result b/mysql-test/main/join_outer_jcl6.result index 53d510b18ec..38223c904b5 100644 --- a/mysql-test/main/join_outer_jcl6.result +++ b/mysql-test/main/join_outer_jcl6.result @@ -2856,7 +2856,7 @@ Election Voted ElectionID drop table t1, t2; drop view v1; # -# and another contrived example showing a bit of heirarchy +# and another contrived example showing a bit of hierarchy # create table t10 (a int); create table t20 (b int); diff --git a/mysql-test/main/loaddata.test b/mysql-test/main/loaddata.test index dbf345fc69e..6cb372b4a4c 100644 --- a/mysql-test/main/loaddata.test +++ b/mysql-test/main/loaddata.test @@ -545,7 +545,7 @@ connect (con1,localhost,root,,test); CREATE TABLE t1 (id INT NOT NULL); --send LOAD DATA LOCAL INFILE 'tb.txt' INTO TABLE t1 -# please keep this is a spearate test file : it's important to have no +# please keep this is a separate test file : it's important to have no # commands after this one connection default; @@ -557,7 +557,7 @@ connection default; disconnect con1; ############################################################################# -# The below protion is moved to ctype_ucs.test # +# The below portion is moved to ctype_ucs.test # ############################################################################# #--echo # #--echo # Bug #51876 : crash/memory underrun when loading data with ucs2 diff --git a/mysql-test/main/lock.result b/mysql-test/main/lock.result index d0adc923563..b5f379e8575 100644 --- a/mysql-test/main/lock.result +++ b/mysql-test/main/lock.result @@ -192,7 +192,7 @@ table2_rowid SMALLINT NOT NULL INSERT INTO t1 VALUES (1); INSERT INTO t2 VALUES (1); LOCK TABLES t1 WRITE, t2 READ; -# Sub-select should not try to aquire a write lock. +# Sub-select should not try to acquire a write lock. DELETE FROM t1 WHERE EXISTS ( diff --git a/mysql-test/main/lock.test b/mysql-test/main/lock.test index 3e21fb891b8..41cc9f8061b 100644 --- a/mysql-test/main/lock.test +++ b/mysql-test/main/lock.test @@ -247,7 +247,7 @@ table2_rowid SMALLINT NOT NULL INSERT INTO t1 VALUES (1); INSERT INTO t2 VALUES (1); LOCK TABLES t1 WRITE, t2 READ; ---echo # Sub-select should not try to aquire a write lock. +--echo # Sub-select should not try to acquire a write lock. DELETE FROM t1 WHERE EXISTS ( diff --git a/mysql-test/main/lock_sync.test b/mysql-test/main/lock_sync.test index 844d00d3a33..9a51b38faf5 100644 --- a/mysql-test/main/lock_sync.test +++ b/mysql-test/main/lock_sync.test @@ -1127,7 +1127,7 @@ SELECT f() FROM t2; # Now we hold test/f, the below code creates concurrent # waiting of 3 threads for test/f which leads to deadlock (Bad) -# To achive Good comment out 'now wait_for s1' below and run multiple times. +# To achieve Good comment out 'now wait_for s1' below and run multiple times. --connect (con2,localhost,root,,test) set debug_sync= 'after_open_table_mdl_shared signal s1'; diff --git a/mysql-test/main/log_tables.test b/mysql-test/main/log_tables.test index cb07d006dd7..a01d49109fe 100644 --- a/mysql-test/main/log_tables.test +++ b/mysql-test/main/log_tables.test @@ -206,7 +206,7 @@ alter table mysql.slow_log engine=myisam; show create table mysql.general_log; show create table mysql.slow_log; -# enable log tables and chek that new tables indeed work +# enable log tables and check that new tables indeed work set global general_log='ON'; set global slow_query_log='ON'; @@ -243,7 +243,7 @@ set global slow_query_log='OFF'; # check that alter table doesn't work for other engines set @save_storage_engine= @@session.default_storage_engine; set default_storage_engine= MEMORY; -# After fixing bug#35765 the error behaivor changed: +# After fixing bug#35765 the error behavior changed: # If compiled in/enabled ER_UNSUPORTED_LOG_ENGINE # If not (i.e. not existant) it will show a warning # and use the current one. diff --git a/mysql-test/main/long_unique_bugs.result b/mysql-test/main/long_unique_bugs.result index 560270305ea..ad1ab7c327d 100644 --- a/mysql-test/main/long_unique_bugs.result +++ b/mysql-test/main/long_unique_bugs.result @@ -764,7 +764,7 @@ b CREATE TABLE `b` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci drop table b; drop table a; -# veirfy that duplicate has unique is detected +# verify that duplicate has unique is detected create table t1 (a blob unique); alter table t1 add constraint constraint_1 unique (a); Warnings: diff --git a/mysql-test/main/long_unique_bugs.test b/mysql-test/main/long_unique_bugs.test index a407ce59e24..7d4247338d2 100644 --- a/mysql-test/main/long_unique_bugs.test +++ b/mysql-test/main/long_unique_bugs.test @@ -724,7 +724,7 @@ show create table b; drop table b; drop table a; ---echo # veirfy that duplicate has unique is detected +--echo # verify that duplicate has unique is detected create table t1 (a blob unique); alter table t1 add constraint constraint_1 unique (a); drop table t1; diff --git a/mysql-test/main/long_unique_bugs_replication.test b/mysql-test/main/long_unique_bugs_replication.test index 9c44d13e6a5..4a13326614f 100644 --- a/mysql-test/main/long_unique_bugs_replication.test +++ b/mysql-test/main/long_unique_bugs_replication.test @@ -24,7 +24,7 @@ drop table t1; --echo # MDEV-32093 long uniques break old->new replication --echo # -# this is techically a bug in replication, but it needs an old master +# this is technically a bug in replication, but it needs an old master # so we'll run it as a non-replicated test with BINLOG command sync_slave_with_master; create table t1 (id int not null, b1 varchar(255) not null, b2 varchar(2550) not null, unique (id), unique key (b1,b2) using hash) default charset utf8mb3; diff --git a/mysql-test/main/lowercase_fs_on.test b/mysql-test/main/lowercase_fs_on.test index 9a7fc369207..0045e58af1c 100644 --- a/mysql-test/main/lowercase_fs_on.test +++ b/mysql-test/main/lowercase_fs_on.test @@ -25,7 +25,7 @@ let SEARCH_FILE= $MYSQLTEST_VARDIR/log/my_restart.err; --error 1 --exec $MYSQLD_CMD --lower_case_table_names=0 > $SEARCH_FILE 2>&1 -#Search for the error messege in the server error log. +#Search for the error message in the server error log. let SEARCH_PATTERN= \[ERROR\] The server option \'lower_case_table_names\' is configured to use case sensitive table names; --source include/search_pattern_in_file.inc diff --git a/mysql-test/main/master_retry_count_basic.result b/mysql-test/main/master_retry_count_basic.result index 7619c74c502..b274d285b32 100644 --- a/mysql-test/main/master_retry_count_basic.result +++ b/mysql-test/main/master_retry_count_basic.result @@ -14,7 +14,7 @@ FROM information_schema.SLAVE_STATUS; Connection_name Master_Retry_Count 10 named 11 -# Conventional views also show the configuations +# Conventional views also show the configurations Connection_name = '' Connection_name = 'named' Master_Retry_Count = '10' diff --git a/mysql-test/main/master_retry_count_basic.test b/mysql-test/main/master_retry_count_basic.test index 85aa5e61d87..8e7fc110ed5 100644 --- a/mysql-test/main/master_retry_count_basic.test +++ b/mysql-test/main/master_retry_count_basic.test @@ -16,7 +16,7 @@ CHANGE MASTER TO master_retry_count=10; SELECT Connection_name, Master_Retry_Count FROM information_schema.SLAVE_STATUS; ---echo # Conventional views also show the configuations +--echo # Conventional views also show the configurations --let $all_slaves_status= 1 --let $status_items= Connection_name, Master_Retry_Count --source include/show_slave_status.inc diff --git a/mysql-test/main/mdev-34724.result b/mysql-test/main/mdev-34724.result index fffe0f83d7c..f41161eb7b5 100644 --- a/mysql-test/main/mdev-34724.result +++ b/mysql-test/main/mdev-34724.result @@ -235,7 +235,7 @@ BEGIN INSERT INTO t2 VALUES (OLD.a, NEW.a); END $ -# The following statement UPDATE doens't modify the row (1) +# The following statement UPDATE doesn't modify the row (1) # since this row is explicitly ignored by implementation of # trigger t1_bu, therefore the trigger t1_au is not fired # for this row and the row (1, 11) not inserted into the table t2 diff --git a/mysql-test/main/mdev-34724.test b/mysql-test/main/mdev-34724.test index 75832b8c705..fe93b924cde 100644 --- a/mysql-test/main/mdev-34724.test +++ b/mysql-test/main/mdev-34724.test @@ -216,7 +216,7 @@ END $ --delimiter ; ---echo # The following statement UPDATE doens't modify the row (1) +--echo # The following statement UPDATE doesn't modify the row (1) --echo # since this row is explicitly ignored by implementation of --echo # trigger t1_bu, therefore the trigger t1_au is not fired --echo # for this row and the row (1, 11) not inserted into the table t2 diff --git a/mysql-test/main/mdl_sync.result b/mysql-test/main/mdl_sync.result index f1e374e3a13..85281953a7a 100644 --- a/mysql-test/main/mdl_sync.result +++ b/mysql-test/main/mdl_sync.result @@ -44,7 +44,7 @@ connection default; set debug_sync= 'RESET'; create table t1 (c1 int); # -# A) First let us check compatibility rules between differend kinds of +# A) First let us check compatibility rules between different kinds of # type-of-operation aware metadata locks. # Of course, these rules are already covered by the tests scattered # across the test suite. But it still makes sense to have one place @@ -1981,7 +1981,7 @@ connection deadlock_con2; set debug_sync='now WAIT_FOR parked2'; # Resume ALTER execution. Eventually it will release its # metadata lock and INSERT's request for SW lock will be -# satisified. +# satisfied. set debug_sync='now SIGNAL go1'; # connection default; @@ -2470,7 +2470,7 @@ disconnect con1; # Bug#50786 Assertion `thd->mdl_context.trans_sentinel() == __null' # failed in open_ltable() # -# Supress warnings written to the log file +# Suppress warnings written to the log file call mtr.add_suppression("Wait on a lock was aborted due to a pending exclusive lock"); connect con1,localhost,root; connect con2,localhost,root; diff --git a/mysql-test/main/mdl_sync.test b/mysql-test/main/mdl_sync.test index aa3bd60e64e..d652bb74921 100644 --- a/mysql-test/main/mdl_sync.test +++ b/mysql-test/main/mdl_sync.test @@ -91,7 +91,7 @@ set debug_sync= 'RESET'; create table t1 (c1 int); --echo # ---echo # A) First let us check compatibility rules between differend kinds of +--echo # A) First let us check compatibility rules between different kinds of --echo # type-of-operation aware metadata locks. --echo # Of course, these rules are already covered by the tests scattered --echo # across the test suite. But it still makes sense to have one place @@ -2450,7 +2450,7 @@ connection deadlock_con2; set debug_sync='now WAIT_FOR parked2'; --echo # Resume ALTER execution. Eventually it will release its --echo # metadata lock and INSERT's request for SW lock will be ---echo # satisified. +--echo # satisfied. set debug_sync='now SIGNAL go1'; --echo # @@ -3173,7 +3173,7 @@ disconnect con1; --echo # failed in open_ltable() --echo # ---echo # Supress warnings written to the log file +--echo # Suppress warnings written to the log file call mtr.add_suppression("Wait on a lock was aborted due to a pending exclusive lock"); connect (con1,localhost,root); diff --git a/mysql-test/main/multi_update_binlog.test b/mysql-test/main/multi_update_binlog.test index 16155aa1af3..567b552a791 100644 --- a/mysql-test/main/multi_update_binlog.test +++ b/mysql-test/main/multi_update_binlog.test @@ -22,7 +22,7 @@ CREATE TABLE `t2` ( PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 ; -# as the test is about to see erroed queries in binlog +# as the test is about to see errored queries in binlog set @sav_binlog_format= @@session.binlog_format; set @@session.binlog_format= mixed; diff --git a/mysql-test/main/myisampack.test b/mysql-test/main/myisampack.test index a63f0bcd484..fafa723a1c7 100644 --- a/mysql-test/main/myisampack.test +++ b/mysql-test/main/myisampack.test @@ -202,12 +202,12 @@ SELECT COUNT(a) FROM t3; --echo #the command should fail with exit status 2 # # Note: Use of regular expressions in this file is for output printed in result file -# The main purpose of this regular expression is to supress the filenames for +# The main purpose of this regular expression is to suppress the filenames for # error messages produced so that we can create a generic result file # #1. /.*myisampack(\.exe)?: Can't create\/write to file .*\(/myisampack: Can't create\/write to file (/ # Replace everything before "myisampack" or "myisampack.exe" and followed by -# ": Can't create\/write to file " until the first open paranthesis , with +# ": Can't create\/write to file " until the first open parentheses , with # "myisampack: Can't create\/write to file (" # #2. /Aborted: .*is/Aborted: file is/ diff --git a/mysql-test/main/mysql.test b/mysql-test/main/mysql.test index a8f33092a41..fd70987ab77 100644 --- a/mysql-test/main/mysql.test +++ b/mysql-test/main/mysql.test @@ -134,7 +134,7 @@ drop table t1; --exec echo "use" > $file --exec $MYSQL < $file 2>&1 -# Test exceutable comments +# Test executable comments --exec echo "SELECT 1 /*! +1 */;" > $file --exec echo "SELECT 1 /*M! +1 */;" >> $file --exec echo "SELECT 1 /*!00000 +1 */;" >> $file diff --git a/mysql-test/main/mysql_upgrade_to_100502.result b/mysql-test/main/mysql_upgrade_to_100502.result index 54f4d273c5e..79cb364a62e 100644 --- a/mysql-test/main/mysql_upgrade_to_100502.result +++ b/mysql-test/main/mysql_upgrade_to_100502.result @@ -58,13 +58,13 @@ SHOW GRANTS FOR user_all@localhost; Grants for user_all@localhost GRANT ALL PRIVILEGES ON *.* TO `user_all`@`localhost` WITH GRANT OPTION # -# Should automatically get all new 10.5.2 priveleges that were splitted from SUPER +# Should automatically get all new 10.5.2 privileges that were splitted from SUPER # SHOW GRANTS FOR user_super@localhost; Grants for user_super@localhost GRANT SUPER, BINLOG MONITOR, SET USER, FEDERATED ADMIN, CONNECTION ADMIN, READ_ONLY ADMIN, REPLICATION SLAVE ADMIN, REPLICATION MASTER ADMIN, BINLOG ADMIN, BINLOG REPLAY, SLAVE MONITOR ON *.* TO `user_super`@`localhost` # -# Should automatically get all new 10.5.2 priveleges that were splitted from SUPER, plus REPLICATION MASTER ADMIN +# Should automatically get all new 10.5.2 privileges that were splitted from SUPER, plus REPLICATION MASTER ADMIN # SHOW GRANTS FOR user_super_replslave@localhost; Grants for user_super_replslave@localhost diff --git a/mysql-test/main/mysql_upgrade_to_100502.test b/mysql-test/main/mysql_upgrade_to_100502.test index a5bda5b6546..618400ccc90 100644 --- a/mysql-test/main/mysql_upgrade_to_100502.test +++ b/mysql-test/main/mysql_upgrade_to_100502.test @@ -64,12 +64,12 @@ FLUSH PRIVILEGES; SHOW GRANTS FOR user_all@localhost; --echo # ---echo # Should automatically get all new 10.5.2 priveleges that were splitted from SUPER +--echo # Should automatically get all new 10.5.2 privileges that were splitted from SUPER --echo # SHOW GRANTS FOR user_super@localhost; --echo # ---echo # Should automatically get all new 10.5.2 priveleges that were splitted from SUPER, plus REPLICATION MASTER ADMIN +--echo # Should automatically get all new 10.5.2 privileges that were splitted from SUPER, plus REPLICATION MASTER ADMIN --echo # SHOW GRANTS FOR user_super_replslave@localhost; diff --git a/mysql-test/main/mysqlbinlog.test b/mysql-test/main/mysqlbinlog.test index 585dbfd4b45..3fd6a409cac 100644 --- a/mysql-test/main/mysqlbinlog.test +++ b/mysql-test/main/mysqlbinlog.test @@ -151,7 +151,7 @@ EOF --exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug14157.sql --remove_file $MYSQLTEST_VARDIR/tmp/bug14157.sql -# resulted binlog, parly consisting of multi-byte utf8 chars, +# resulted binlog, partly consisting of multi-byte utf8 chars, # must be digestable for both client and server. In 4.1 the client # should use default-character-set same as the server. @@ -449,7 +449,7 @@ FLUSH LOGS; RESET MASTER; FLUSH LOGS; -# The following three test cases were wrtten into binlog_transaction.000001 +# The following three test cases were written into binlog_transaction.000001 # Test case1: Test if the 'BEGIN' and 'COMMIT' are output for the 'test' database # in transaction1 base on innodb engine tables # use test; diff --git a/mysql-test/main/mysqldump.result b/mysql-test/main/mysqldump.result index 59b7b83d91e..cb1bbfb4a5c 100644 --- a/mysql-test/main/mysqldump.result +++ b/mysql-test/main/mysqldump.result @@ -6008,7 +6008,7 @@ DROP VIEW v1; DROP FUNCTION f; # Running mysql -uroot test < **vardir**/test.dmp # -# Cleanup after succesful import. +# Cleanup after successful import. # DROP VIEW v1; DROP FUNCTION f; diff --git a/mysql-test/main/mysqldump.test b/mysql-test/main/mysqldump.test index 5052ef044a9..78d16057413 100644 --- a/mysql-test/main/mysqldump.test +++ b/mysql-test/main/mysqldump.test @@ -2663,7 +2663,7 @@ DROP FUNCTION f; --exec $MYSQL -uroot test < $MYSQLTEST_VARDIR/test.dmp --echo # ---echo # Cleanup after succesful import. +--echo # Cleanup after successful import. --echo # DROP VIEW v1; DROP FUNCTION f; diff --git a/mysql-test/main/mysqltest.test b/mysql-test/main/mysqltest.test index 4895d06f66e..eb6c1bffc91 100644 --- a/mysql-test/main/mysqltest.test +++ b/mysql-test/main/mysqltest.test @@ -2148,7 +2148,7 @@ reap; select * from t1; --reap -# 4. Non-query stmt betwen send and reap allowed +# 4. Non-query stmt between send and reap is allowed --send select * from t1; --sleep 0.05 diff --git a/mysql-test/main/named_pipe.test b/mysql-test/main/named_pipe.test index 3f01b415fc5..a71db6397a9 100644 --- a/mysql-test/main/named_pipe.test +++ b/mysql-test/main/named_pipe.test @@ -5,7 +5,7 @@ # Named pipe does not support the non-blocking API. --disable_non_blocking_api -# Only run this test if named pipe is avaliable +# Only run this test if named pipe is available let $nmp= query_get_value("SHOW VARIABLES LIKE 'named_pipe'", Value, 1); if ($nmp != ON){ skip No named pipe support; diff --git a/mysql-test/main/natural_sort_key.test b/mysql-test/main/natural_sort_key.test index 811f937750c..30d0eff6527 100644 --- a/mysql-test/main/natural_sort_key.test +++ b/mysql-test/main/natural_sort_key.test @@ -17,7 +17,7 @@ INSERT INTO t1 values ('äb'),('B1'),('B100'),('B9'),('C'),('100'); -- echo #Natural sort order. -# We sort by 2 colums, for stable sort,as we do not currenly have a case and accent insensitive Unicode collation. +# We sort by 2 colums, for stable sort,as we do not currently have a case and accent insensitive Unicode collation. SELECT c FROM t1 ORDER BY k,c; -- echo #Unnatural but unicode aware) sort order SELECT c FROM t1 ORDER BY CONVERT(c USING utf8mb4) COLLATE utf8mb4_unicode_ci,c; diff --git a/mysql-test/main/odbc.test b/mysql-test/main/odbc.test index 4a125bfc72e..015bea7ee7d 100644 --- a/mysql-test/main/odbc.test +++ b/mysql-test/main/odbc.test @@ -12,7 +12,7 @@ set @@session.sql_auto_is_null=1; select {fn length("hello")}, { date "1997-10-20" }; # -# Test retreiving row with last insert_id value. +# Test retrieving row with last insert_id value. # create table t1 (a int not null auto_increment,b int not null,primary key (a,b)); diff --git a/mysql-test/main/olap.test b/mysql-test/main/olap.test index 4daae933e51..c6864d1751c 100644 --- a/mysql-test/main/olap.test +++ b/mysql-test/main/olap.test @@ -185,7 +185,7 @@ SELECT SQL_CALC_FOUND_ROWS a, SUM(b) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1; DROP TABLE t1; # -# Tests for bug #9681: ROLLUP in subquery for derived table wiht +# Tests for bug #9681: ROLLUP in subquery for derived table with # a group by field declared as NOT NULL # diff --git a/mysql-test/main/opt_trace.result b/mysql-test/main/opt_trace.result index e3099480f33..bdb7b9718be 100644 --- a/mysql-test/main/opt_trace.result +++ b/mysql-test/main/opt_trace.result @@ -3277,7 +3277,7 @@ explain select t1.a from t1 left join (t2 join t3 on t2.b=t3.b) on t2.a=t1.a and } 0 0 drop table t0, t1, t2, t3; # -# IN subquery to sem-join is traced +# IN subquery to semi-join is traced # create table t1(a int, b int); insert into t1 select seq,seq from seq_0_to_3; diff --git a/mysql-test/main/opt_trace.test b/mysql-test/main/opt_trace.test index 7ba8f3770df..b915ddd7e02 100644 --- a/mysql-test/main/opt_trace.test +++ b/mysql-test/main/opt_trace.test @@ -201,7 +201,7 @@ select * from INFORMATION_SCHEMA.OPTIMIZER_TRACE; drop table t0, t1, t2, t3; --echo # ---echo # IN subquery to sem-join is traced +--echo # IN subquery to semi-join is traced --echo # create table t1(a int, b int); diff --git a/mysql-test/main/opt_tvc.result b/mysql-test/main/opt_tvc.result index 819d42b5392..beafad5e5ec 100644 --- a/mysql-test/main/opt_tvc.result +++ b/mysql-test/main/opt_tvc.result @@ -535,7 +535,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used Warnings: Note 1003 /* select#1 */ select `test`.`t3`.`a` AS `a`,`test`.`t3`.`b` AS `b` from (values (1),(4)) `tvc_0` join `test`.`t3` where `test`.`t3`.`a` = `tvc_0`.`_col_1` -# use vectors in IN predeicate +# use vectors in IN predicate set @@in_predicate_conversion_threshold= 4; select * from t1 where (a,b) in ((1,2),(3,4)); a b diff --git a/mysql-test/main/opt_tvc.test b/mysql-test/main/opt_tvc.test index 7d39c6a8979..1288e0d51a6 100644 --- a/mysql-test/main/opt_tvc.test +++ b/mysql-test/main/opt_tvc.test @@ -282,7 +282,7 @@ set @@in_predicate_conversion_threshold= 2; eval $query; eval explain extended $query; ---echo # use vectors in IN predeicate +--echo # use vectors in IN predicate set @@in_predicate_conversion_threshold= 4; diff --git a/mysql-test/main/parser.result b/mysql-test/main/parser.result index f36c9e9d505..95ee8d6e99b 100644 --- a/mysql-test/main/parser.result +++ b/mysql-test/main/parser.result @@ -931,7 +931,7 @@ ERROR HY000: Expression #1 of ORDER BY contains aggregate function and applies t SELECT 1 AS a UNION SELECT a FROM t1 GROUP BY a ORDER BY GROUP_CONCAT(a ORDER BY a); ERROR HY000: Expression #1 of ORDER BY contains aggregate function and applies to a UNION DROP TABLE t1; -# UNION with a parenthesed term +# UNION with a parenthesized term CREATE TABLE t1 (a INT); INSERT INTO t1 VALUES (10),(20),(30); SELECT 1 AS a UNION (SELECT a FROM t1 GROUP BY a ORDER BY GROUP_CONCAT(a ORDER BY a) LIMIT 2); @@ -986,7 +986,7 @@ ERROR HY000: Incorrect usage of CUBE/ROLLUP and ORDER BY SELECT 1 AS a UNION (SELECT a FROM t1 GROUP BY a WITH ROLLUP ORDER BY GROUP_CONCAT(a ORDER BY a)); ERROR HY000: Incorrect usage of CUBE/ROLLUP and ORDER BY DROP TABLE t1; -# UNION with a non-parethesized term with ROLLUP +# UNION with a non-parenthesized term with ROLLUP # This will change after: MDEV-10120 Wrong result of UNION .. ORDER BY GROUP_CONCAT() # Currently we're testing the parser only CREATE TABLE t1 (a INT); diff --git a/mysql-test/main/parser.test b/mysql-test/main/parser.test index 0ce490ac6fb..64df5334201 100644 --- a/mysql-test/main/parser.test +++ b/mysql-test/main/parser.test @@ -1105,7 +1105,7 @@ SELECT 1 AS a UNION SELECT a FROM t1 GROUP BY a ORDER BY GROUP_CONCAT(a); SELECT 1 AS a UNION SELECT a FROM t1 GROUP BY a ORDER BY GROUP_CONCAT(a ORDER BY a); DROP TABLE t1; ---echo # UNION with a parenthesed term +--echo # UNION with a parenthesized term CREATE TABLE t1 (a INT); INSERT INTO t1 VALUES (10),(20),(30); @@ -1135,7 +1135,7 @@ SELECT 1 AS a UNION (SELECT a FROM t1 GROUP BY a WITH ROLLUP ORDER BY GROUP_CONC SELECT 1 AS a UNION (SELECT a FROM t1 GROUP BY a WITH ROLLUP ORDER BY GROUP_CONCAT(a ORDER BY a)); DROP TABLE t1; ---echo # UNION with a non-parethesized term with ROLLUP +--echo # UNION with a non-parenthesized term with ROLLUP --echo # This will change after: MDEV-10120 Wrong result of UNION .. ORDER BY GROUP_CONCAT() --echo # Currently we're testing the parser only diff --git a/mysql-test/main/partition.test b/mysql-test/main/partition.test index 55ed87d57da..7ceeb1ce79f 100644 --- a/mysql-test/main/partition.test +++ b/mysql-test/main/partition.test @@ -2048,7 +2048,7 @@ select c1 from t1 group by (select c0 from t1 limit 1); drop table t1; # Bug #30495: optimize table t1,t2,t3 extended errors -# (added more maintenace commands for Bug#20129 +# (added more maintenance commands for Bug#20129 CREATE TABLE t1(a int) PARTITION BY RANGE (a) ( PARTITION p1 VALUES LESS THAN (10), diff --git a/mysql-test/main/partition_column.result b/mysql-test/main/partition_column.result index b895838114c..fc29c01d2b8 100644 --- a/mysql-test/main/partition_column.result +++ b/mysql-test/main/partition_column.result @@ -1,7 +1,7 @@ drop table if exists t1; # # Bug#52815: LIST COLUMNS doesn't insert rows in correct partition -# if muliple columns used +# if multiple columns used CREATE TABLE t1 ( id INT NOT NULL, name VARCHAR(255), diff --git a/mysql-test/main/partition_column.test b/mysql-test/main/partition_column.test index be34e4eac63..4e4a0bc7df4 100644 --- a/mysql-test/main/partition_column.test +++ b/mysql-test/main/partition_column.test @@ -10,7 +10,7 @@ drop table if exists t1; --echo # --echo # Bug#52815: LIST COLUMNS doesn't insert rows in correct partition ---echo # if muliple columns used +--echo # if multiple columns used CREATE TABLE t1 ( id INT NOT NULL, name VARCHAR(255), diff --git a/mysql-test/main/partition_datatype.result b/mysql-test/main/partition_datatype.result index deef5c0c1e7..da1ed009832 100644 --- a/mysql-test/main/partition_datatype.result +++ b/mysql-test/main/partition_datatype.result @@ -441,7 +441,7 @@ INSERT INTO t1 VALUES ('2011-03-27 01:59:59', 'Moscow'); INSERT INTO t1 VALUES ('2011-03-27 03:00:00', 'Moscow'); INSERT INTO t1 VALUES ('2011-03-27 03:00:01', 'Moscow'); INSERT INTO t1 VALUES ('2011-10-30 01:59:59', 'Moscow'); -# All values between 02:00 and 02:59:59 will be interpretated as DST +# All values between 02:00 and 02:59:59 will be interpreted as DST INSERT INTO t1 VALUES ('2011-10-30 02:00:00', 'MoscowD'); INSERT INTO t1 VALUES ('2011-10-30 02:00:01', 'MoscowD'); INSERT INTO t1 VALUES ('2011-10-30 02:59:59', 'MoscowD'); diff --git a/mysql-test/main/partition_datatype.test b/mysql-test/main/partition_datatype.test index 9e05141818a..bf9034018fa 100644 --- a/mysql-test/main/partition_datatype.test +++ b/mysql-test/main/partition_datatype.test @@ -317,7 +317,7 @@ INSERT INTO t1 VALUES ('2011-03-27 01:59:59', 'Moscow'); INSERT INTO t1 VALUES ('2011-03-27 03:00:00', 'Moscow'); INSERT INTO t1 VALUES ('2011-03-27 03:00:01', 'Moscow'); INSERT INTO t1 VALUES ('2011-10-30 01:59:59', 'Moscow'); ---echo # All values between 02:00 and 02:59:59 will be interpretated as DST +--echo # All values between 02:00 and 02:59:59 will be interpreted as DST INSERT INTO t1 VALUES ('2011-10-30 02:00:00', 'MoscowD'); INSERT INTO t1 VALUES ('2011-10-30 02:00:01', 'MoscowD'); INSERT INTO t1 VALUES ('2011-10-30 02:59:59', 'MoscowD'); diff --git a/mysql-test/main/partition_default.test b/mysql-test/main/partition_default.test index b0424f567e4..dfcaa0a4bec 100644 --- a/mysql-test/main/partition_default.test +++ b/mysql-test/main/partition_default.test @@ -125,7 +125,7 @@ create table t1 (a int, b int) ; # -# partititon prunning test +# partition prunning test # create table t1 (a int, b int) diff --git a/mysql-test/main/partition_exchange.test b/mysql-test/main/partition_exchange.test index 711a51c09f8..996da21c219 100644 --- a/mysql-test/main/partition_exchange.test +++ b/mysql-test/main/partition_exchange.test @@ -427,7 +427,7 @@ ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t; # Verify that it is possible to both read and write to the partition that is # going to be exchanged # test mdl locking (i.e. together with transactions and other ddl) -# Add test in lc_0-2 to make sure renameing operators is ok with different lc +# Add test in lc_0-2 to make sure renaming operators is ok with different lc # Add test to exchange between databases, also check grants. # Add test for privileges # check if correct error whithout partitioning support diff --git a/mysql-test/main/partition_explicit_prune.result b/mysql-test/main/partition_explicit_prune.result index 11e0dc7c0bb..5cad54d0472 100644 --- a/mysql-test/main/partition_explicit_prune.result +++ b/mysql-test/main/partition_explicit_prune.result @@ -226,7 +226,7 @@ INSERT INTO t1 PARTITION (pNonExisting) VALUES (1, "error"); ERROR HY000: Unknown partition 'pNonExisting' in table 't1' INSERT INTO t1 PARTITION (pNeg, pNonExisting) VALUES (1, "error"); ERROR HY000: Unknown partition 'pNonExisting' in table 't1' -# Duplicate partitions and overlapping partitions and subpartitios is OK +# Duplicate partitions and overlapping partitions and subpartitions is OK FLUSH STATUS; INSERT INTO t1 PARTITION (pNeg, pNeg) VALUES (-1, "pNeg(-subp1)"); SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS @@ -1291,7 +1291,7 @@ HANDLER_TMP_WRITE 24 SELECT * FROM t3 PARTITION (pNeg); ERROR HY000: PARTITION () clause on non partitioned table DROP TABLE t1, t2, t3; -# Test from superseeded WL# 2682 +# Test from superseded WL# 2682 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; CREATE TABLE `t1` ( `id` int(11) default NULL diff --git a/mysql-test/main/partition_explicit_prune.test b/mysql-test/main/partition_explicit_prune.test index a3b74be58e0..bd42af70aa2 100644 --- a/mysql-test/main/partition_explicit_prune.test +++ b/mysql-test/main/partition_explicit_prune.test @@ -134,7 +134,7 @@ INSERT INTO t1 PARTITION () VALUES (1, "error"); INSERT INTO t1 PARTITION (pNonExisting) VALUES (1, "error"); --error ER_UNKNOWN_PARTITION INSERT INTO t1 PARTITION (pNeg, pNonExisting) VALUES (1, "error"); ---echo # Duplicate partitions and overlapping partitions and subpartitios is OK +--echo # Duplicate partitions and overlapping partitions and subpartitions is OK FLUSH STATUS; INSERT INTO t1 PARTITION (pNeg, pNeg) VALUES (-1, "pNeg(-subp1)"); eval $get_handler_status_counts; @@ -627,7 +627,7 @@ DROP TABLE t1, t2, t3; --enable_ps2_protocol --enable_view_protocol --enable_cursor_protocol ---echo # Test from superseeded WL# 2682 +--echo # Test from superseded WL# 2682 # Partition select tests. # --disable_warnings diff --git a/mysql-test/main/partition_hash.test b/mysql-test/main/partition_hash.test index c8f473a0477..f6edd7ee7e4 100644 --- a/mysql-test/main/partition_hash.test +++ b/mysql-test/main/partition_hash.test @@ -1,7 +1,7 @@ #--disable_abort_on_error # # Simple test for the partition storage engine -# Taken fromm the select test +# Taken from the select test # -- source include/have_partition.inc diff --git a/mysql-test/main/partition_key_cache.result b/mysql-test/main/partition_key_cache.result index 0ed95756600..ebd53647983 100644 --- a/mysql-test/main/partition_key_cache.result +++ b/mysql-test/main/partition_key_cache.result @@ -1,5 +1,5 @@ # Actual test of key caches -# Verifing that reads/writes use the key cache correctly +# Verifying that reads/writes use the key cache correctly SET @org_key_cache_buffer_size= @@global.default.key_buffer_size; # Minimize default key cache (almost disabled). SET @@global.default.key_buffer_size = 4096; diff --git a/mysql-test/main/partition_key_cache.test b/mysql-test/main/partition_key_cache.test index 914322ebac3..acefaeca275 100644 --- a/mysql-test/main/partition_key_cache.test +++ b/mysql-test/main/partition_key_cache.test @@ -2,7 +2,7 @@ --source include/have_partition.inc --echo # Actual test of key caches ---echo # Verifing that reads/writes use the key cache correctly +--echo # Verifying that reads/writes use the key cache correctly SET @org_key_cache_buffer_size= @@global.default.key_buffer_size; --echo # Minimize default key cache (almost disabled). SET @@global.default.key_buffer_size = 4096; diff --git a/mysql-test/main/partition_myisam.test b/mysql-test/main/partition_myisam.test index 70bd4a77794..d03d636a22d 100644 --- a/mysql-test/main/partition_myisam.test +++ b/mysql-test/main/partition_myisam.test @@ -166,7 +166,7 @@ PARTITION BY RANGE (a) PARTITION `p1....................` VALUES LESS THAN (9), PARTITION p2 VALUES LESS THAN MAXVALUE); # partition p1 is 't1#P#p1' + @002e * 20 = 107 characters + file ending -# total path lenght of './test/t1#P#p1@002e@002e<...>@002e.MY[ID]' is 118 chars +# total path length of './test/t1#P#p1@002e@002e<...>@002e.MY[ID]' is 118 chars --echo # List of files in database `test`, all original t1-files here --list_files $MYSQLD_DATADIR/test t1* INSERT INTO t1 VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10); diff --git a/mysql-test/main/partition_pruning.test b/mysql-test/main/partition_pruning.test index 2cfcf5d084e..32ff78e9e68 100644 --- a/mysql-test/main/partition_pruning.test +++ b/mysql-test/main/partition_pruning.test @@ -813,7 +813,7 @@ explain partitions select * from t7 where a > 91; # misc intervals explain partitions select * from t7 where a > 11 and a < 29; -# LIST(monontonic_func) partitioning +# LIST(monotonic_func) partitioning create table t8 (a date not null) partition by RANGE(YEAR(a)) ( partition p0 values less than (1980), partition p1 values less than (1990), diff --git a/mysql-test/main/partition_rename_longfilename.test b/mysql-test/main/partition_rename_longfilename.test index 51d9c583f56..a080e563ed9 100644 --- a/mysql-test/main/partition_rename_longfilename.test +++ b/mysql-test/main/partition_rename_longfilename.test @@ -20,7 +20,7 @@ PARTITION BY RANGE (a) PARTITION `p1....................` VALUES LESS THAN (9), PARTITION p2 VALUES LESS THAN MAXVALUE); # partition p1 is 't1#P#p1' + @002e * 20 = 107 characters + file ending -# total path lenght of './test/t1#P#p1@002e@002e<...>@002e.MY[ID]' is 118 chars +# total path length of './test/t1#P#p1@002e@002e<...>@002e.MY[ID]' is 118 chars --echo # List of files in database `test`, all original t1-files here --list_files $MYSQLD_DATADIR/test t1* INSERT INTO t1 VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10); diff --git a/mysql-test/main/plugin.test b/mysql-test/main/plugin.test index 52c362a865d..d9bda357316 100644 --- a/mysql-test/main/plugin.test +++ b/mysql-test/main/plugin.test @@ -103,7 +103,7 @@ select @@global.example_ulong_var; set global example_ulong_var=1111; select @@global.example_ulong_var; -# now, try STRICT (error occurrs, no message is sent, so send default) +# now, try STRICT (error occurs, no message is sent, so send default) set session sql_mode='STRICT_ALL_TABLES'; set global example_ulong_var=500; select @@global.example_ulong_var; diff --git a/mysql-test/main/plugin_auth.result b/mysql-test/main/plugin_auth.result index 9d296f48c28..d3c224fc424 100644 --- a/mysql-test/main/plugin_auth.result +++ b/mysql-test/main/plugin_auth.result @@ -307,7 +307,7 @@ ERROR 28000: Access denied for user 'root'@'localhost' # access denied because of no privileges to root REVOKE PROXY ON u2@localhost FROM u1@localhost; ERROR 28000: Access denied for user 'root'@'localhost' -# go try graning proxy on itself, so that it will need the table +# go try granting proxy on itself, so that it will need the table connect proxy_granter_con,localhost,u2,; GRANT PROXY ON u2@localhost TO u1@localhost; ERROR 42S02: Table 'mysql.proxies_priv' doesn't exist @@ -444,9 +444,9 @@ rename table mysql.global_priv_bak to mysql.global_priv; # Bug # 11766641: 59792: BIN/MYSQL -UUNKNOWN -PUNKNOWN # .-> USING PASSWORD: NO # -# shoud contain "using password=yes" +# should contain "using password=yes" ERROR 1045 (28000): Access denied for user 'unknown'@'localhost' (using password: YES) -# shoud contain "using password=no" +# should contain "using password=no" ERROR 1045 (28000): Access denied for user 'unknown'@'localhost' (using password: NO) # # Bug #12610784: SET PASSWORD INCORRECTLY KEEP AN OLD EMPTY PASSWORD diff --git a/mysql-test/main/plugin_auth.test b/mysql-test/main/plugin_auth.test index 71e0b9435c3..730d09fee82 100644 --- a/mysql-test/main/plugin_auth.test +++ b/mysql-test/main/plugin_auth.test @@ -173,7 +173,7 @@ GRANT PROXY ON grant_plug TO grant_plug_dest; # Security context in THD contains two pairs of (user,host) # 1. (user,host) pair referring to inbound connection # 2. (priv_user,priv_host) pair obtained from mysql.user table after doing -# authnetication of incoming connection. +# authentication of incoming connection. # Granting/revoking proxy privileges, privileges should be checked wrt # (priv_user, priv_host) tuple that is obtained from mysql.user table # Following is a valid grant because effective user of connection is @@ -362,7 +362,7 @@ GRANT PROXY ON u2@localhost TO u1@localhost; --error ER_ACCESS_DENIED_NO_PASSWORD_ERROR REVOKE PROXY ON u2@localhost FROM u1@localhost; ---echo # go try graning proxy on itself, so that it will need the table +--echo # go try granting proxy on itself, so that it will need the table connect(proxy_granter_con,localhost,u2,); --error ER_NO_SUCH_TABLE @@ -515,11 +515,11 @@ rename table mysql.global_priv_bak to mysql.global_priv; --echo # .-> USING PASSWORD: NO --echo # ---echo # shoud contain "using password=yes" +--echo # should contain "using password=yes" --error 1 --exec $MYSQL -uunknown -punknown 2>&1 ---echo # shoud contain "using password=no" +--echo # should contain "using password=no" --error 1 --exec $MYSQL -uunknown 2>&1 diff --git a/mysql-test/main/precedence.test b/mysql-test/main/precedence.test index 7837b34afc2..c92567b0f85 100644 --- a/mysql-test/main/precedence.test +++ b/mysql-test/main/precedence.test @@ -1,5 +1,5 @@ # -# A fairly exhastive test for operator precedence +# A fairly exhaustive test for operator precedence # disable_warnings; diff --git a/mysql-test/main/ps.test b/mysql-test/main/ps.test index e095c5e278b..fa8ffc854de 100644 --- a/mysql-test/main/ps.test +++ b/mysql-test/main/ps.test @@ -241,7 +241,7 @@ drop table t1; # # Bug#5034 "prepared "select 1 into @arg15", second execute crashes # server". -# Check that descendands of select_result can be reused in prepared +# Check that descendants of select_result can be reused in prepared # statements or are correctly created and deleted on each execute # diff --git a/mysql-test/main/ps_11bugs.test b/mysql-test/main/ps_11bugs.test index 7cb5708d062..dd1b8c64ad5 100644 --- a/mysql-test/main/ps_11bugs.test +++ b/mysql-test/main/ps_11bugs.test @@ -15,7 +15,7 @@ drop table if exists t1, t2; --enable_warnings -# bug#1180: optimized away part of WHERE clause cause incorect prepared satatement results +# bug#1180: optimized away part of WHERE clause cause incorrect prepared statement results CREATE TABLE t1(session_id char(9) NOT NULL); INSERT INTO t1 VALUES ("abc"); diff --git a/mysql-test/main/ps_ddl.result b/mysql-test/main/ps_ddl.result index 00de5250bb7..6b91161c18a 100644 --- a/mysql-test/main/ps_ddl.result +++ b/mysql-test/main/ps_ddl.result @@ -2544,7 +2544,7 @@ EXECUTE stmt1; # Create temporary table which will shadow t1. CREATE TEMPORARY TABLE t1 (b int); # The below execution of statement should not fail with ER_CANT_REOPEN -# error. Instead stmt1 should be auto-matically reprepared and succeed. +# error. Instead stmt1 should be automatically reprepared and executed successfully. EXECUTE stmt1; DEALLOCATE PREPARE stmt1; DROP TEMPORARY TABLE t1; diff --git a/mysql-test/main/ps_ddl.test b/mysql-test/main/ps_ddl.test index ba2b00363b8..80848565910 100644 --- a/mysql-test/main/ps_ddl.test +++ b/mysql-test/main/ps_ddl.test @@ -2252,7 +2252,7 @@ EXECUTE stmt1; --echo # Create temporary table which will shadow t1. CREATE TEMPORARY TABLE t1 (b int); --echo # The below execution of statement should not fail with ER_CANT_REOPEN ---echo # error. Instead stmt1 should be auto-matically reprepared and succeed. +--echo # error. Instead stmt1 should be automatically reprepared and executed successfully. EXECUTE stmt1; DEALLOCATE PREPARE stmt1; DROP TEMPORARY TABLE t1; diff --git a/mysql-test/main/ps_mem_leaks.result b/mysql-test/main/ps_mem_leaks.result index 880d86e3d2c..5b449e9305d 100644 --- a/mysql-test/main/ps_mem_leaks.result +++ b/mysql-test/main/ps_mem_leaks.result @@ -424,7 +424,7 @@ a DROP TABLE t1; CREATE TABLE t1 (a INT); SET @@debug_dbug='+d,check_sp_cache_not_invalidated,sp_instr_reparsing_1st_time'; -# Recomplilation of the statement 'SELECT * FORM t1' on +# Recompilation of the statement 'SELECT * FORM t1' on # the second run of the procedure p1 shouldn't result in memory leaks CALL p1(); a diff --git a/mysql-test/main/ps_mem_leaks.test b/mysql-test/main/ps_mem_leaks.test index 09e91b25538..2b2f912a2fc 100644 --- a/mysql-test/main/ps_mem_leaks.test +++ b/mysql-test/main/ps_mem_leaks.test @@ -340,7 +340,7 @@ PREPARE stmt FROM "UPDATE t SET a = 0 LIMIT ?"; EXECUTE stmt USING 0; EXECUTE stmt USING 1; -# CLeanup +# Cleanup DROP TABLE t; --echo # @@ -451,7 +451,7 @@ CALL p1(); DROP TABLE t1; CREATE TABLE t1 (a INT); SET @@debug_dbug='+d,check_sp_cache_not_invalidated,sp_instr_reparsing_1st_time'; ---echo # Recomplilation of the statement 'SELECT * FORM t1' on +--echo # Recompilation of the statement 'SELECT * FORM t1' on --echo # the second run of the procedure p1 shouldn't result in memory leaks CALL p1(); SET @@debug_dbug='-d,sp_instr_reparsing_1st_time'; diff --git a/mysql-test/main/ps_missed_cmds.result b/mysql-test/main/ps_missed_cmds.result index bde750434b3..ff04b56e658 100644 --- a/mysql-test/main/ps_missed_cmds.result +++ b/mysql-test/main/ps_missed_cmds.result @@ -108,7 +108,7 @@ EXECUTE stmt_1; # were damaged. The second attempt to run 'DROP FUNCTION f1' using # prepared statement expectedly results in issuing the error # ER_SP_DOES_NOT_EXIST since the stored function was dropped on first -# executuon of the prepared statement stmt_1. +# execution of the prepared statement stmt_1. EXECUTE stmt_1; ERROR 42000: FUNCTION test.f1 does not exist # Test case 6: Check that the 'CHECK TABLE' statement is supported @@ -415,7 +415,7 @@ INSERT INTO t1 VALUES (1); EXECUTE stmt_2; # Prepare the current XA transaction for finalization EXECUTE stmt_3; -# Rolback the current XA transaction +# Rollback the current XA transaction EXECUTE stmt_6; # Execute the same prepared statement the second time to check that # no internal structures used for handling the statement 'XA ROLLBACK' diff --git a/mysql-test/main/ps_missed_cmds.test b/mysql-test/main/ps_missed_cmds.test index 0bf12a2e477..eb6a7e050a7 100644 --- a/mysql-test/main/ps_missed_cmds.test +++ b/mysql-test/main/ps_missed_cmds.test @@ -130,7 +130,7 @@ EXECUTE stmt_1; --echo # were damaged. The second attempt to run 'DROP FUNCTION f1' using --echo # prepared statement expectedly results in issuing the error --echo # ER_SP_DOES_NOT_EXIST since the stored function was dropped on first ---echo # executuon of the prepared statement stmt_1. +--echo # execution of the prepared statement stmt_1. --error ER_SP_DOES_NOT_EXIST EXECUTE stmt_1; @@ -466,7 +466,7 @@ EXECUTE stmt_2; --echo # Prepare the current XA transaction for finalization EXECUTE stmt_3; ---echo # Rolback the current XA transaction +--echo # Rollback the current XA transaction EXECUTE stmt_6; --echo # Execute the same prepared statement the second time to check that diff --git a/mysql-test/main/ps_missed_cmds_bin_prot.result b/mysql-test/main/ps_missed_cmds_bin_prot.result index adb6eda2c56..f2df991c216 100644 --- a/mysql-test/main/ps_missed_cmds_bin_prot.result +++ b/mysql-test/main/ps_missed_cmds_bin_prot.result @@ -124,7 +124,7 @@ SELECT @a; 1 DROP PROCEDURE p1; # Test case 13: Check that the statements PREPARE FROM/EXECUTE/ -# DEALLOCAT PREPARE can be executed as prepared statements. +# DEALLOCATE PREPARE can be executed as prepared statements. PREPARE stmt_1 FROM 'SELECT 1'; # Now execute the prepared statement with the name stmt_1 # It is expected that output contains the single row '1' diff --git a/mysql-test/main/ps_missed_cmds_bin_prot.test b/mysql-test/main/ps_missed_cmds_bin_prot.test index a2be5507414..58b09b87343 100644 --- a/mysql-test/main/ps_missed_cmds_bin_prot.test +++ b/mysql-test/main/ps_missed_cmds_bin_prot.test @@ -154,7 +154,7 @@ SELECT @a; DROP PROCEDURE p1; --echo # Test case 13: Check that the statements PREPARE FROM/EXECUTE/ ---echo # DEALLOCAT PREPARE can be executed as prepared statements. +--echo # DEALLOCATE PREPARE can be executed as prepared statements. PREPARE stmt_1 FROM 'SELECT 1'; --echo # Now execute the prepared statement with the name stmt_1 diff --git a/mysql-test/main/ps_missed_cmds_bin_prot_not_embedded.result b/mysql-test/main/ps_missed_cmds_bin_prot_not_embedded.result index 0e36165db33..4006edae381 100644 --- a/mysql-test/main/ps_missed_cmds_bin_prot_not_embedded.result +++ b/mysql-test/main/ps_missed_cmds_bin_prot_not_embedded.result @@ -7,7 +7,7 @@ SET default_storage_engine= InnoDB; # DROP EVENT can be executed as a prepared statement # Create the event e1 that specifies time in past. Such event is created # just for the sake of its existence and never will be triggered. -# Disable warnings temprorary in order to hide the following warnings +# Temporarily disable warnings in order to hide the following warnings # generated in result of execution the 'CREATE EVENT' statement: # "1544 | Event execution time is in the past. Event has been disabled" # "1105 | Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it." diff --git a/mysql-test/main/ps_missed_cmds_bin_prot_not_embedded.test b/mysql-test/main/ps_missed_cmds_bin_prot_not_embedded.test index 6d87441a476..c9cede7559d 100644 --- a/mysql-test/main/ps_missed_cmds_bin_prot_not_embedded.test +++ b/mysql-test/main/ps_missed_cmds_bin_prot_not_embedded.test @@ -18,7 +18,7 @@ SET default_storage_engine= InnoDB; --echo # Create the event e1 that specifies time in past. Such event is created --echo # just for the sake of its existence and never will be triggered. ---echo # Disable warnings temprorary in order to hide the following warnings +--echo # Temporarily disable warnings in order to hide the following warnings --echo # generated in result of execution the 'CREATE EVENT' statement: --echo # "1544 | Event execution time is in the past. Event has been disabled" --echo # "1105 | Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it." diff --git a/mysql-test/main/ps_missed_cmds_not_embedded.result b/mysql-test/main/ps_missed_cmds_not_embedded.result index 959a78b5591..1cd67f9c2cc 100644 --- a/mysql-test/main/ps_missed_cmds_not_embedded.result +++ b/mysql-test/main/ps_missed_cmds_not_embedded.result @@ -15,7 +15,7 @@ PREPARE stmt_2 FROM "ALTER EVENT e1 COMMENT 'New comment'"; PREPARE stmt_3 FROM "DROP EVENT e1"; # Create the event e1 that specifies time in past. Such event is created # just for the sake of its existence and never will be triggered. -# Disable warnings temprorary in order to hide the following warnings +# Temporarily disable warnings in order to hide the following warnings # generated in result of execution the 'CREATE EVENT' statement: # "1544 | Event execution time is in the past. Event has been disabled" # "1105 | Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it." diff --git a/mysql-test/main/ps_missed_cmds_not_embedded.test b/mysql-test/main/ps_missed_cmds_not_embedded.test index 018334b912c..43de018fa4d 100644 --- a/mysql-test/main/ps_missed_cmds_not_embedded.test +++ b/mysql-test/main/ps_missed_cmds_not_embedded.test @@ -30,7 +30,7 @@ PREPARE stmt_2 FROM "ALTER EVENT e1 COMMENT 'New comment'"; PREPARE stmt_3 FROM "DROP EVENT e1"; --echo # Create the event e1 that specifies time in past. Such event is created --echo # just for the sake of its existence and never will be triggered. ---echo # Disable warnings temprorary in order to hide the following warnings +--echo # Temporarily disable warnings in order to hide the following warnings --echo # generated in result of execution the 'CREATE EVENT' statement: --echo # "1544 | Event execution time is in the past. Event has been disabled" --echo # "1105 | Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it." diff --git a/mysql-test/main/ps_show_log.result b/mysql-test/main/ps_show_log.result index dbe078e7d1b..1bd2c2a53e5 100644 --- a/mysql-test/main/ps_show_log.result +++ b/mysql-test/main/ps_show_log.result @@ -49,7 +49,7 @@ DEALLOCATE PREPARE stmt_1; # Create the user u1 without the REPLICATION SLAVE privilege required # for running the statements SHOW BINLOG EVENTS/SHOW RELAYLOG EVENTS # and check that attempt to execute the statements SHOW BINLOG EVENTS/ -# SHOW RELAYLOG EVENTS as a prepred statements by a user without required +# SHOW RELAYLOG EVENTS as a prepared statements by a user without required # privileges results in error. connect con2,localhost,u1,,"*NO-ONE*"; PREPARE stmt_1 FROM 'SHOW BINLOG EVENTS'; diff --git a/mysql-test/main/ps_show_log.test b/mysql-test/main/ps_show_log.test index 411b15600e1..3b806fe72e3 100644 --- a/mysql-test/main/ps_show_log.test +++ b/mysql-test/main/ps_show_log.test @@ -48,7 +48,7 @@ DEALLOCATE PREPARE stmt_1; --echo # Create the user u1 without the REPLICATION SLAVE privilege required --echo # for running the statements SHOW BINLOG EVENTS/SHOW RELAYLOG EVENTS --echo # and check that attempt to execute the statements SHOW BINLOG EVENTS/ ---echo # SHOW RELAYLOG EVENTS as a prepred statements by a user without required +--echo # SHOW RELAYLOG EVENTS as a prepared statements by a user without required --echo # privileges results in error. --connect (con2,localhost,u1,,"*NO-ONE*") diff --git a/mysql-test/main/query_cache.test b/mysql-test/main/query_cache.test index 1994b84f184..64807da232b 100644 --- a/mysql-test/main/query_cache.test +++ b/mysql-test/main/query_cache.test @@ -384,7 +384,7 @@ update t1 set i=(select distinct 1 from (select * from t2) a); drop table t1, t2, t3; # -# system databse test +# system database test # use mysql; disable_result_log; diff --git a/mysql-test/main/query_cache_with_views.test b/mysql-test/main/query_cache_with_views.test index 498a0648081..5a06088d005 100644 --- a/mysql-test/main/query_cache_with_views.test +++ b/mysql-test/main/query_cache_with_views.test @@ -43,7 +43,7 @@ drop view v1,v2; set query_cache_type=demand; --disable_ps2_protocol flush global status; -# query with view will be cached, but direct acess to table will not +# query with view will be cached, but direct access to table will not create view v1 (c,d) as select sql_cache a,b from t1; show status like "Qcache_queries_in_cache"; show status like "Qcache_inserts"; diff --git a/mysql-test/main/range.result b/mysql-test/main/range.result index 1f4a5678bb5..70480222a6f 100644 --- a/mysql-test/main/range.result +++ b/mysql-test/main/range.result @@ -3505,7 +3505,7 @@ id subset_id 2 2 3 3 4 4 -# non-mergable subquery +# non-mergeable subquery # expected for t1: range access and rows = 4 (not 1000) explain SELECT * FROM t1 WHERE t1.subset_id IN (SELECT max(t2.id) FROM t2 group by t2.col); diff --git a/mysql-test/main/range.test b/mysql-test/main/range.test index 0874a3e92e8..9bff8b5d683 100644 --- a/mysql-test/main/range.test +++ b/mysql-test/main/range.test @@ -238,7 +238,7 @@ SELECT * FROM t1 WHERE a IN(1,2) AND b=5; DROP TABLE t1; # -# Test problem with range optimzer and sub ranges +# Test problem with range optimizer and sub ranges # CREATE TABLE t1 (a int, b int, c int, INDEX (c,a,b)); @@ -2372,7 +2372,7 @@ eval $q; let $q= SELECT * FROM t1 WHERE t1.subset_id IN (SELECT max(t2.id) FROM t2 group by t2.col); ---echo # non-mergable subquery +--echo # non-mergeable subquery --echo # expected for t1: range access and rows = 4 (not 1000) eval explain $q; eval $q; diff --git a/mysql-test/main/range_mrr_icp.result b/mysql-test/main/range_mrr_icp.result index 60088a050b6..accf79d9c49 100644 --- a/mysql-test/main/range_mrr_icp.result +++ b/mysql-test/main/range_mrr_icp.result @@ -3503,7 +3503,7 @@ id subset_id 2 2 3 3 4 4 -# non-mergable subquery +# non-mergeable subquery # expected for t1: range access and rows = 4 (not 1000) explain SELECT * FROM t1 WHERE t1.subset_id IN (SELECT max(t2.id) FROM t2 group by t2.col); diff --git a/mysql-test/main/range_vs_index_merge.test b/mysql-test/main/range_vs_index_merge.test index f956ef527b3..8033a52e0f9 100644 --- a/mysql-test/main/range_vs_index_merge.test +++ b/mysql-test/main/range_vs_index_merge.test @@ -38,7 +38,7 @@ set session optimizer_switch='index_merge_sort_intersection=off'; # The following 4 queries are added for code coverage -#the exptected # of rows differ on 32-bit and 64-bit platforms for innodb +#the expected # of rows differ on 32-bit and 64-bit platforms for innodb --replace_column 9 4079 EXPLAIN SELECT * FROM City diff --git a/mysql-test/main/rename.test b/mysql-test/main/rename.test index a0b9f38ae2e..bedbcf94040 100644 --- a/mysql-test/main/rename.test +++ b/mysql-test/main/rename.test @@ -63,7 +63,7 @@ reap; connection con2; # Wait for the the tables to be renamed -# i.e the query below succeds +# i.e the query below succeeds let $query= select * from t2, t4; source include/wait_for_query_to_succeed.inc; diff --git a/mysql-test/main/repair.test b/mysql-test/main/repair.test index e038b7bd419..64574ac414a 100644 --- a/mysql-test/main/repair.test +++ b/mysql-test/main/repair.test @@ -264,7 +264,7 @@ DROP TABLE t1; # # MDEV-17153 server crash on repair table ... use_frm # -# Note, this test case doesn't crash, but shows spurios warnings +# Note, this test case doesn't crash, but shows spurious warnings # unless the bug is fixed # create table t1 (a int, b varchar(200)); diff --git a/mysql-test/main/replace_returning_err.test b/mysql-test/main/replace_returning_err.test index 383bd1e1c8b..37f45537707 100644 --- a/mysql-test/main/replace_returning_err.test +++ b/mysql-test/main/replace_returning_err.test @@ -5,8 +5,8 @@ #REPLACE INTO ... RETURNING #REPLACE INTO
... RETURNING #REPLACE INTO ... RETURNING subquery with more than 1 row -#REPLACE INTO ... RETURNING operand should contain 1 colunm(s) -#REPLACE INTO ... RETURNING operand should contain 1 colunm(s) +#REPLACE INTO ... RETURNING operand should contain 1 column(s) +#REPLACE INTO ... RETURNING operand should contain 1 column(s) #REPLACE INTO ... SELECT...RETURNING < SELECT FROM CREATE TABLE t1(id1 INT PRIMARY KEY, val1 VARCHAR(1)); diff --git a/mysql-test/main/row.test b/mysql-test/main/row.test index 8fae416063c..4096e5e0acc 100644 --- a/mysql-test/main/row.test +++ b/mysql-test/main/row.test @@ -161,7 +161,7 @@ DROP TABLE t1; # End of 4.1 tests # -# Correct NULL handling in row comporison (BUG#12509) +# Correct NULL handling in row comparison (BUG#12509) # SELECT ROW(1,1,1) = ROW(1,1,1) as `1`, ROW(1,1,1) = ROW(1,2,1) as `0`, ROW(1,NULL,1) = ROW(2,2,1) as `0`, ROW(1,NULL,1) = ROW(1,2,2) as `0`, ROW(1,NULL,1) = ROW(1,2,1) as `null` ; select row(NULL,1)=(2,0); diff --git a/mysql-test/main/rownum.test b/mysql-test/main/rownum.test index a68a432b606..7512e0ae28a 100644 --- a/mysql-test/main/rownum.test +++ b/mysql-test/main/rownum.test @@ -1,6 +1,6 @@ --source include/have_sequence.inc # -# Test of basic rownum() functionallity +# Test of basic rownum() functionality # Test are done with Aria to ensure that row order is stable # diff --git a/mysql-test/main/select.test b/mysql-test/main/select.test index e988dcf5baf..bf70fb27e92 100644 --- a/mysql-test/main/select.test +++ b/mysql-test/main/select.test @@ -1544,7 +1544,7 @@ INSERT INTO t4 (companynr, companyname) VALUES (50,'company 11'); INSERT INTO t4 (companynr, companyname) VALUES (00,'Unknown'); --enable_query_log # -# Test of stright join to force a full join. +# Test of straight join to force a full join. # select STRAIGHT_JOIN t2.companynr,companyname from t4,t2 where t2.companynr=t4.companynr group by t2.companynr; @@ -1606,7 +1606,7 @@ select distinct t2.companynr,t4.companynr from t2,t4 where t2.companynr=t4.compa explain select distinct t2.companynr,t4.companynr from t2,t4 where t2.companynr=t4.companynr+1; # -# Search using 'or' with the same referens group. +# Search using 'or' with the same reference group. # An interval search will be done first with the first table and after that # the other table is referenced with a key with a 'test if key in use' for # each record @@ -1883,7 +1883,7 @@ insert into t1 values (); # , select * from (t1 as t2 left join t1 as t3 using (a)), t1; select * from t1, (t1 as t2 left join t1 as t3 using (a)); -# stright_join +# straight_join select * from (t1 as t2 left join t1 as t3 using (a)) straight_join t1; select * from t1 straight_join (t1 as t2 left join t1 as t3 using (a)); # inner join on @@ -1908,7 +1908,7 @@ select * from t1 natural left join (t1 as t2 left join t1 as t3 using (a)); select * from (t1 as t2 left join t1 as t3 using (a)) right join t1 on t1.a>1; --sorted_result select * from t1 right join (t1 as t2 left join t1 as t3 using (a)) on t1.a>1; -# right [outer] joing using +# right [outer] join using select * from (t1 as t2 left join t1 as t3 using (a)) right outer join t1 using ( a ); select * from t1 right outer join (t1 as t2 left join t1 as t3 using (a)) using ( a ); # natural right join diff --git a/mysql-test/main/session_user.result b/mysql-test/main/session_user.result index 5f3c428d925..d2d743e9043 100644 --- a/mysql-test/main/session_user.result +++ b/mysql-test/main/session_user.result @@ -24,7 +24,7 @@ CREATE OR REPLACE TABLE t1 (a int, b varchar(100) GENERATED ALWAYS AS (SESSION_U # Check SESSION_USER is not allowed for indexed virtual columns CREATE OR REPLACE TABLE t1 (a int, b varchar(100) GENERATED ALWAYS AS (SESSION_USER()), INDEX idx (b)); ERROR HY000: Function or expression 'session_user()' cannot be used in the GENERATED ALWAYS AS clause of `b` -# Check SESSION_USER is not allowed in virtual columns when CHECK constrains are provided +# Check SESSION_USER is not allowed in virtual columns when CHECK constraints are provided CREATE OR REPLACE TABLE t1 (a int, b varchar(100) GENERATED ALWAYS AS (SESSION_USER()) CHECK (b <> '')); ERROR HY000: Function or expression 'b' cannot be used in the CHECK clause of `b` # Check SESSION_USER is not allowed for stored virtual columns diff --git a/mysql-test/main/session_user.test b/mysql-test/main/session_user.test index b02a177d7c5..877011b02ea 100644 --- a/mysql-test/main/session_user.test +++ b/mysql-test/main/session_user.test @@ -29,7 +29,7 @@ CREATE OR REPLACE TABLE t1 (a int, b varchar(100) GENERATED ALWAYS AS (SESSION_U --echo # Check SESSION_USER is not allowed for indexed virtual columns --error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED CREATE OR REPLACE TABLE t1 (a int, b varchar(100) GENERATED ALWAYS AS (SESSION_USER()), INDEX idx (b)); ---echo # Check SESSION_USER is not allowed in virtual columns when CHECK constrains are provided +--echo # Check SESSION_USER is not allowed in virtual columns when CHECK constraints are provided --error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED CREATE OR REPLACE TABLE t1 (a int, b varchar(100) GENERATED ALWAYS AS (SESSION_USER()) CHECK (b <> '')); --echo # Check SESSION_USER is not allowed for stored virtual columns diff --git a/mysql-test/main/set_statement.test b/mysql-test/main/set_statement.test index 35bb8a026fe..0597f0cf57a 100644 --- a/mysql-test/main/set_statement.test +++ b/mysql-test/main/set_statement.test @@ -932,7 +932,7 @@ SET @@sort_buffer_size = @save_sort_buffer_size; # # Percona sever bug#1341606 -# SET STATEMENT incorrectly restore vaues of some variables +# SET STATEMENT incorrectly restore values of some variables # --echo #Correctly set timestamp set session timestamp=4646464; diff --git a/mysql-test/main/show_check.test b/mysql-test/main/show_check.test index b95cebff4f0..83628a95b96 100644 --- a/mysql-test/main/show_check.test +++ b/mysql-test/main/show_check.test @@ -536,7 +536,7 @@ DROP VIEW IF EXISTS v1; DROP PROCEDURE IF EXISTS p1; --enable_warnings -# Check that SHOW CREATE VIEW shows SQL_CACHE flag exaclty as +# Check that SHOW CREATE VIEW shows SQL_CACHE flag exactly as # specified by the user. CREATE VIEW v1 AS SELECT 1; SHOW CREATE VIEW v1; diff --git a/mysql-test/main/signal.result b/mysql-test/main/signal.result index 6a7f1c1e750..b2001519502 100644 --- a/mysql-test/main/signal.result +++ b/mysql-test/main/signal.result @@ -1318,7 +1318,7 @@ drop procedure test_signal $$ # RETURN statement clears Diagnostics Area, thus # the warnings raised in a stored function are not -# visible outsidef the stored function. So, we're using +# visible outside the stored function. So, we're using # @@warning_count variable to check that SIGNAL succeeded. create function test_signal_func() returns integer diff --git a/mysql-test/main/signal.test b/mysql-test/main/signal.test index 97cd4d9a5d0..bf7145ecf4c 100644 --- a/mysql-test/main/signal.test +++ b/mysql-test/main/signal.test @@ -1553,7 +1553,7 @@ drop procedure test_signal $$ --echo --echo # RETURN statement clears Diagnostics Area, thus --echo # the warnings raised in a stored function are not ---echo # visible outsidef the stored function. So, we're using +--echo # visible outside the stored function. So, we're using --echo # @@warning_count variable to check that SIGNAL succeeded. --echo diff --git a/mysql-test/main/sp-anchor-type.test b/mysql-test/main/sp-anchor-type.test index 70d2a4b0c3a..57030e6a5a1 100644 --- a/mysql-test/main/sp-anchor-type.test +++ b/mysql-test/main/sp-anchor-type.test @@ -842,7 +842,7 @@ SELECT * FROM t2; DROP TABLE t2; # Let's change "TYPE OF t1.a" after the function has been successfully called -# and thus is already in the SP chache. +# and thus is already in the SP cache. DROP TABLE t1; CREATE TABLE t1 (a INT); diff --git a/mysql-test/main/sp-code.test b/mysql-test/main/sp-code.test index 3fd9997a4fb..50932f71ce2 100644 --- a/mysql-test/main/sp-code.test +++ b/mysql-test/main/sp-code.test @@ -509,7 +509,7 @@ show procedure code proc_26977_broken; show procedure code proc_26977_works; -## This caust an error because of jump short cut +## This causes an error because of jump short cut ## optimization. call proc_26977_broken(1); diff --git a/mysql-test/main/sp-destruct.test b/mysql-test/main/sp-destruct.test index 4bdfed70545..587ed3c2636 100644 --- a/mysql-test/main/sp-destruct.test +++ b/mysql-test/main/sp-destruct.test @@ -9,7 +9,7 @@ -- source include/not_embedded.inc -# Supress warnings written to the log file +# Suppress warnings written to the log file call mtr.add_suppression("Column count of mysql.proc is wrong. Expected 21, found 20. The table is probably corrupted"); call mtr.add_suppression("Stored routine .test...bug14233_[123].: invalid value in column mysql.proc"); diff --git a/mysql-test/main/sp-dynamic.test b/mysql-test/main/sp-dynamic.test index 5749a83a27b..1b47100573c 100644 --- a/mysql-test/main/sp-dynamic.test +++ b/mysql-test/main/sp-dynamic.test @@ -24,7 +24,7 @@ call p1()| call p1()| drop procedure p1| # -# B. Recursion. Recusion is disabled in SP, and recursive use of PS is not +# B. Recursion. Recursion is disabled in SP, and recursive use of PS is not # possible as well. # create procedure p1() diff --git a/mysql-test/main/sp-error.test b/mysql-test/main/sp-error.test index bf97bcc7577..c58ae3f2204 100644 --- a/mysql-test/main/sp-error.test +++ b/mysql-test/main/sp-error.test @@ -801,7 +801,7 @@ begin return b; end| -# Some things must be caught at invokation time +# Some things must be caught at invocation time create function bug8408_f() returns int begin call bug8408_p(); @@ -976,7 +976,7 @@ drop table t1, t2; # Bug #11394 "Recursion in SP crash server" and bug #11600 "Stored # procedures: crash with function calling itself". # We have to disable recursion since in many cases LEX and many -# Item's can't be used in reentrant way nowdays. +# Item's can't be used in reentrant way nowadays. delimiter |; create function bug11394(i int) returns int begin diff --git a/mysql-test/main/sp-lock.result b/mysql-test/main/sp-lock.result index 969b307c4e6..14ea248db7b 100644 --- a/mysql-test/main/sp-lock.result +++ b/mysql-test/main/sp-lock.result @@ -119,7 +119,7 @@ drop temporary table t1; # # For that, start a transaction, use a routine. In a concurrent # connection, try to drop or alter the routine. It should place -# a pending or exclusive lock and block. In another concurrnet +# a pending or exclusive lock and block. In another concurrent # connection, try to use the routine. # That should block on the pending exclusive lock. # diff --git a/mysql-test/main/sp-lock.test b/mysql-test/main/sp-lock.test index 9ca071070ac..89b0fc3bd19 100644 --- a/mysql-test/main/sp-lock.test +++ b/mysql-test/main/sp-lock.test @@ -133,7 +133,7 @@ drop temporary table t1; --echo # --echo # For that, start a transaction, use a routine. In a concurrent --echo # connection, try to drop or alter the routine. It should place ---echo # a pending or exclusive lock and block. In another concurrnet +--echo # a pending or exclusive lock and block. In another concurrent --echo # connection, try to use the routine. --echo # That should block on the pending exclusive lock. --echo # diff --git a/mysql-test/main/sp-package.test b/mysql-test/main/sp-package.test index 15f534ff6ea..55e78245980 100644 --- a/mysql-test/main/sp-package.test +++ b/mysql-test/main/sp-package.test @@ -4,7 +4,7 @@ # # CREATE PACKAGE for sql_mode=''; -# Resebmles SQL Standard 'CREATE MODULE'. +# Resembles SQL Standard 'CREATE MODULE'. # SET sql_mode=''; diff --git a/mysql-test/main/sp-security-debug.test b/mysql-test/main/sp-security-debug.test index 82eeb4944b6..81613ddf343 100644 --- a/mysql-test/main/sp-security-debug.test +++ b/mysql-test/main/sp-security-debug.test @@ -1,5 +1,5 @@ # -# Testing SQL SECURITY of stored procedures (DEBUGG binaries) +# Testing SQL SECURITY of stored procedures (DEBUG binaries) # --source include/have_debug.inc diff --git a/mysql-test/main/sp-vars.test b/mysql-test/main/sp-vars.test index 2676fe9ed6a..5eeb42cfaa3 100644 --- a/mysql-test/main/sp-vars.test +++ b/mysql-test/main/sp-vars.test @@ -1373,7 +1373,7 @@ DROP PROCEDURE p1; # # Bug #27415 Text Variables in stored procedures -# If the SP varible was also referenced on the right side +# If the SP variable was also referenced on the right side # the result was corrupted. # DELIMITER |; diff --git a/mysql-test/main/sp.result b/mysql-test/main/sp.result index 15435d3a236..87f540d0e5f 100644 --- a/mysql-test/main/sp.result +++ b/mysql-test/main/sp.result @@ -8425,11 +8425,11 @@ END' at line 2 # Specifying the RESTART clause for the statement CREATE SEQUENCE is a syntax error. # Check that CREATE PROCEDURE doesn't crash server if the statement -# CREATE SEQUNCE ... RESTART is specified in its body. +# CREATE SEQUENCE ... RESTART is specified in its body. # CREATE PROCEDURE sp1() CREATE SEQUENCE s1 START WITH 300 INCREMENT BY 30 RESTART; ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'RESTART' at line 1 -# CREATE SEQUNCE ... RESTART and CREATE SEQUNCE ... RESTART WITH ... are +# CREATE SEQUENCE ... RESTART and CREATE SEQUENCE ... RESTART WITH ... are # handled by different grammar rules, so check the both cases. CREATE PROCEDURE sp1() CREATE SEQUENCE s1 START WITH 300 INCREMENT BY 30 RESTART WITH 100; ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'RESTART' at line 1 @@ -8467,7 +8467,7 @@ CREATE FUNCTION f3 () RETURNS VARCHAR(1) RETURN f_not_exist(); CREATE VIEW v1 AS SELECT f3() z; SELECT f1(); ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them -# Check that crash doen't happen in case f3 completes with success. +# Check that crash doesn't happen in case f3 completes with success. DROP FUNCTION f3; CREATE FUNCTION f3 () RETURNS VARCHAR(1) RETURN '!'; SELECT f1(); diff --git a/mysql-test/main/sp.test b/mysql-test/main/sp.test index ed5488b3894..773f44d5dfa 100644 --- a/mysql-test/main/sp.test +++ b/mysql-test/main/sp.test @@ -473,7 +473,7 @@ select * from t1| delete from t1| drop procedure i| -# SELECT with one of more result set sent back to the clinet +# SELECT with one or more result sets sent back to the client insert into t1 values ("foo", 3), ("bar", 19)| insert into t2 values ("x", 9, 4.1), ("y", -1, 19.2), ("z", 3, 2.2)| @@ -1342,7 +1342,7 @@ show procedure status like 'bar'| drop procedure bar| # -# rexecution +# re-execution # create procedure p1 () select (select s1 from t3) from t3| @@ -3415,7 +3415,7 @@ DROP VIEW tv| DROP TABLE tt1, tt2, tt3| # -# BUG#10136: items cleunup +# BUG#10136: items cleanup # create table t3 ( name char(5) not null primary key, val float not null)| insert into t3 values ('aaaaa', 1), ('bbbbb', 2), ('ccccc', 3)| @@ -9322,11 +9322,11 @@ DELIMITER ;$$ --echo # Specifying the RESTART clause for the statement CREATE SEQUENCE is a syntax error. --echo # Check that CREATE PROCEDURE doesn't crash server if the statement ---echo # CREATE SEQUNCE ... RESTART is specified in its body. +--echo # CREATE SEQUENCE ... RESTART is specified in its body. --echo # --error ER_PARSE_ERROR CREATE PROCEDURE sp1() CREATE SEQUENCE s1 START WITH 300 INCREMENT BY 30 RESTART; ---echo # CREATE SEQUNCE ... RESTART and CREATE SEQUNCE ... RESTART WITH ... are +--echo # CREATE SEQUENCE ... RESTART and CREATE SEQUENCE ... RESTART WITH ... are --echo # handled by different grammar rules, so check the both cases. --error ER_PARSE_ERROR CREATE PROCEDURE sp1() CREATE SEQUENCE s1 START WITH 300 INCREMENT BY 30 RESTART WITH 100; @@ -9379,7 +9379,7 @@ CREATE VIEW v1 AS SELECT f3() z; --error ER_VIEW_INVALID SELECT f1(); ---echo # Check that crash doen't happen in case f3 completes with success. +--echo # Check that crash doesn't happen in case f3 completes with success. DROP FUNCTION f3; CREATE FUNCTION f3 () RETURNS VARCHAR(1) RETURN '!'; diff --git a/mysql-test/main/sp_trans.test b/mysql-test/main/sp_trans.test index 653e418752e..e8bf5efe5a3 100644 --- a/mysql-test/main/sp_trans.test +++ b/mysql-test/main/sp_trans.test @@ -170,7 +170,7 @@ create procedure bug10015_8() start transaction| select *, bug10015_7() from t1| drop procedure bug10015_8| # Again it is OK to drop temporary table -# We are surpressing warnings since they are not essential +# We are suppressing warnings since they are not essential create procedure bug10015_8() drop temporary table if exists t1_temp| --disable_warnings select *, bug10015_7() from t1| diff --git a/mysql-test/main/sp_validation.result b/mysql-test/main/sp_validation.result index 484a63dc819..ce951c30384 100644 --- a/mysql-test/main/sp_validation.result +++ b/mysql-test/main/sp_validation.result @@ -1938,7 +1938,7 @@ b DROP TRIGGER tr; # Check that AFTER UPDATE trigger is re-compiled on changing table's metadata CREATE TRIGGER tr AFTER UPDATE ON t1 FOR EACH ROW INSERT INTO t2 (b) VALUES (OLD.a); -# Remove records interted by AFTER DELETE trogger +# Remove records inverted by AFTER DELETE trigger TRUNCATE TABLE t1; TRUNCATE TABLE t2; INSERT INTO t1 VALUES (1); diff --git a/mysql-test/main/sp_validation.test b/mysql-test/main/sp_validation.test index 8d448b5f8f0..af1c533de4e 100644 --- a/mysql-test/main/sp_validation.test +++ b/mysql-test/main/sp_validation.test @@ -2737,7 +2737,7 @@ SELECT * FROM t2; DROP TRIGGER tr; --echo # Check that AFTER UPDATE trigger is re-compiled on changing table's metadata CREATE TRIGGER tr AFTER UPDATE ON t1 FOR EACH ROW INSERT INTO t2 (b) VALUES (OLD.a); ---echo # Remove records interted by AFTER DELETE trogger +--echo # Remove records inverted by AFTER DELETE trigger TRUNCATE TABLE t1; TRUNCATE TABLE t2; INSERT INTO t1 VALUES (1); diff --git a/mysql-test/main/ssl_cipher.test b/mysql-test/main/ssl_cipher.test index 62e9a90d915..ba5db603acd 100644 --- a/mysql-test/main/ssl_cipher.test +++ b/mysql-test/main/ssl_cipher.test @@ -56,7 +56,7 @@ EOF --exec $MYSQL_TEST --ssl-cipher=AES256-SHA < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1 # Test to connect using a list of ciphers --exec $MYSQL_TEST --ssl-cipher=UNKNOWN-CIPHER:AES128-SHA < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1 -# Test to connect using a specifi cipher +# Test to connect using a specific cipher --exec $MYSQL_TEST --ssl-cipher=AES128-SHA < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1 # Test to connect using an unknown cipher --replace_regex /2026 TLS\/SSL error.*/2026 TLS\/SSL error: xxxx/ diff --git a/mysql-test/main/statistics.result b/mysql-test/main/statistics.result index ebd9cb7f36e..bc491e1d68c 100644 --- a/mysql-test/main/statistics.result +++ b/mysql-test/main/statistics.result @@ -1688,7 +1688,7 @@ db_name table_name column_name HEX(min_value) HEX(max_value) nulls_ratio avg_fre test t1 a D879626AF872675F73E662F8 D879626AF872675F73E662F8 0.0000 1.0000 0 NULL NULL drop table t1; # -# MDEB-9744: session optimizer_use_condition_selectivity=5 causing SQL Error (1918): +# MDEV-9744: session optimizer_use_condition_selectivity=5 causing SQL Error (1918): # Encountered illegal value '' when converting to DECIMAL # set @save_optimizer_use_condition_selectivity= @@optimizer_use_condition_selectivity; @@ -1839,7 +1839,7 @@ table_name column_name min_value max_value nulls_ratio avg_length avg_frequency t1 id 1 17384 0.0000 4.0000 14.0000 0.15705,0.15711,0.21463,0.15705,0.15711,0.15706 set analyze_sample_percentage=0.1; # -# This query will show an innacurate avg_frequency value. +# This query will show an inaccurate avg_frequency value. # ANALYZE TABLE t1; Table Op Msg_type Msg_text diff --git a/mysql-test/main/statistics.test b/mysql-test/main/statistics.test index 1b71d01e447..ee69b7ac21f 100644 --- a/mysql-test/main/statistics.test +++ b/mysql-test/main/statistics.test @@ -835,7 +835,7 @@ select db_name, table_name, column_name, drop table t1; --echo # ---echo # MDEB-9744: session optimizer_use_condition_selectivity=5 causing SQL Error (1918): +--echo # MDEV-9744: session optimizer_use_condition_selectivity=5 causing SQL Error (1918): --echo # Encountered illegal value '' when converting to DECIMAL --echo # @@ -1001,7 +1001,7 @@ from mysql.column_stats; set analyze_sample_percentage=0.1; --echo # ---echo # This query will show an innacurate avg_frequency value. +--echo # This query will show an inaccurate avg_frequency value. --echo # ANALYZE TABLE t1; --source include/histogram_replaces.inc diff --git a/mysql-test/main/statistics_json.result b/mysql-test/main/statistics_json.result index 6df7b40e7d4..e1189037b00 100644 --- a/mysql-test/main/statistics_json.result +++ b/mysql-test/main/statistics_json.result @@ -3994,7 +3994,7 @@ db_name table_name column_name HEX(min_value) HEX(max_value) nulls_ratio avg_fre test t1 a D879626AF872675F73E662F8 D879626AF872675F73E662F8 0.0000 1.0000 0 NULL NULL drop table t1; # -# MDEB-9744: session optimizer_use_condition_selectivity=5 causing SQL Error (1918): +# MDEV-9744: session optimizer_use_condition_selectivity=5 causing SQL Error (1918): # Encountered illegal value '' when converting to DECIMAL # set @save_optimizer_use_condition_selectivity= @@optimizer_use_condition_selectivity; @@ -4190,7 +4190,7 @@ t1 id 1 17384 0.0000 4.0000 14.0000 { } set analyze_sample_percentage=0.1; # -# This query will show an innacurate avg_frequency value. +# This query will show an inaccurate avg_frequency value. # ANALYZE TABLE t1; Table Op Msg_type Msg_text diff --git a/mysql-test/main/status.test b/mysql-test/main/status.test index 36bb99147c9..769391367ca 100644 --- a/mysql-test/main/status.test +++ b/mysql-test/main/status.test @@ -96,7 +96,7 @@ insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10); insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10); select * from t1 where a=6; show status like 'last_query_cost'; -# Ensure value dosn't change by second status call +# Ensure value doesn't change by second status call show status like 'last_query_cost'; select 1; show status like 'last_query_cost'; diff --git a/mysql-test/main/strict.test b/mysql-test/main/strict.test index 6369eddea36..09a7039954d 100644 --- a/mysql-test/main/strict.test +++ b/mysql-test/main/strict.test @@ -722,7 +722,7 @@ INSERT INTO t1 (col2) VALUES('-1'); --error 1264 INSERT INTO t1 (col2) VALUES('18446744073709551616'); -# Note that the following two double numbers are slighty bigger than max/min +# Note that the following two double numbers are slightly bigger than max/min # bigint becasue of rounding errors when converting it to bigint --error 1264 INSERT INTO t1 (col1) VALUES(-9223372036854785809.0); diff --git a/mysql-test/main/subselect.test b/mysql-test/main/subselect.test index a8bcb3c40a4..23f7a9eea51 100644 --- a/mysql-test/main/subselect.test +++ b/mysql-test/main/subselect.test @@ -196,7 +196,7 @@ explain extended select * from t6 where exists (select * from t7 where uq = clin -- error ER_NON_UNIQ_ERROR select * from t1 where a= (select a from t2,t4 where t2.b=t4.b); -# different tipes & group functions +# different types & group functions drop table t1,t2,t3; CREATE TABLE t3 (a varchar(20),b char(1) NOT NULL default '0'); @@ -1288,7 +1288,7 @@ drop table t1,t2; --enable_view_protocol # -# Static tables & rund() in subqueries +# Static tables & rand() in subqueries # create table t1 (a int); insert into t1 values (1); @@ -1623,7 +1623,7 @@ select (select b.x from t1 as b where b.x=a.x) from t1 as a where a.x=2 group b drop table t1; # -# Test of correct maybe_null flag returning by subquwery for temporary table +# Test of correct maybe_null flag returning by subquery for temporary table # creation # CREATE TABLE `t1` ( `master` int(10) unsigned NOT NULL default '0', `map` smallint(6) unsigned NOT NULL default '0', `slave` int(10) unsigned NOT NULL default '0', `access` int(10) unsigned NOT NULL default '0', UNIQUE KEY `access_u` (`master`,`map`,`slave`)); @@ -1702,7 +1702,7 @@ select s1, s1 < all (select s1 from t1) from t1; drop table t1; # -# reference on changable fields from subquery +# reference on changeable fields from subquery # CREATE TABLE t1 ( Code char(3) NOT NULL default '', @@ -1750,7 +1750,7 @@ drop table t1,t2; create table t1 (a integer, b integer); select (select * from t1) = (select 1,2); select (select 1,2) = (select * from t1); -# queries whih can be converted to IN +# queries which can be converted to IN select row(1,2) = ANY (select * from t1); select row(1,2) != ALL (select * from t1); drop table t1; diff --git a/mysql-test/main/subselect4.result b/mysql-test/main/subselect4.result index 2d1a5f04d84..55ea42fb772 100644 --- a/mysql-test/main/subselect4.result +++ b/mysql-test/main/subselect4.result @@ -49,7 +49,7 @@ INSERT INTO t2 SELECT * FROM t1; CREATE TABLE t3 LIKE t1; INSERT INTO t3 SELECT * FROM t1; # Should not crash. -# Should have 1 impossible where and 2 dependent subqs. +# Should have 1 impossible where and 2 dependent subqueries. EXPLAIN SELECT (SELECT 1 FROM t1,t2 WHERE t2.b > t3.b) @@ -2766,7 +2766,7 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 5 Using where set names utf8 collate utf8_general_ci; # -# IN predicate to IN subquery is performed as materialization is llowed +# IN predicate to IN subquery is performed as materialization is allowed # The character set on the inner side is a proper subset of the outer side # # this test in 10.5 has only 2 rows in the IN predicate diff --git a/mysql-test/main/subselect4.test b/mysql-test/main/subselect4.test index 85790fa5110..43a63f7ed83 100644 --- a/mysql-test/main/subselect4.test +++ b/mysql-test/main/subselect4.test @@ -62,7 +62,7 @@ CREATE TABLE t3 LIKE t1; INSERT INTO t3 SELECT * FROM t1; --echo # Should not crash. ---echo # Should have 1 impossible where and 2 dependent subqs. +--echo # Should have 1 impossible where and 2 dependent subqueries. EXPLAIN SELECT (SELECT 1 FROM t1,t2 WHERE t2.b > t3.b) @@ -2291,7 +2291,7 @@ SELECT * FROM t1 WHERE (t1.a,t1.b) IN (('abx',1),('def',2), ('abc', 3)); set names utf8 collate utf8_general_ci; --echo # ---echo # IN predicate to IN subquery is performed as materialization is llowed +--echo # IN predicate to IN subquery is performed as materialization is allowed --echo # The character set on the inner side is a proper subset of the outer side --echo # diff --git a/mysql-test/main/subselect_cache.test b/mysql-test/main/subselect_cache.test index 7bc897ea06b..0cf18095089 100644 --- a/mysql-test/main/subselect_cache.test +++ b/mysql-test/main/subselect_cache.test @@ -1619,8 +1619,8 @@ set optimizer_switch='subquery_cache=on'; --echo # LP BUG#615378 (incorrect NULL result returning in Item_cache) # # if bug present here will be valgrind warnings (due to attempt to process -# uninialized decimal value) but the result will be correct (due to -# Item::null_value) +# uninitialized decimal value) but the result will be correct (due to +# Item::null_value) CREATE TABLE `t1` ( `pk` int(11) NOT NULL AUTO_INCREMENT, diff --git a/mysql-test/main/subselect_gis.test b/mysql-test/main/subselect_gis.test index 1ab139b7822..ccb4d06c488 100644 --- a/mysql-test/main/subselect_gis.test +++ b/mysql-test/main/subselect_gis.test @@ -5,7 +5,7 @@ drop table if exists t1; --enable_warnings # -# correct behavoiur for function from reduced subselect +# correct behaviour for function from reduced subselect # create table t1(City VARCHAR(30),Location geometry); insert into t1 values("Paris",GeomFromText('POINT(2.33 48.87)')); diff --git a/mysql-test/main/subselect_mat_cost.test b/mysql-test/main/subselect_mat_cost.test index 46bed962ef7..96b44b187e5 100644 --- a/mysql-test/main/subselect_mat_cost.test +++ b/mysql-test/main/subselect_mat_cost.test @@ -457,7 +457,7 @@ drop database world; # IN_EXIST transformations are applied to both subqueries # outer subquery is materialized while the inner subquery is not #(IN_EXIST transformation is applied to it) -# inner subqyery is materialized while the outer subquery is not ( +# inner subquery is materialized while the outer subquery is not ( #IN_EXIST transformation is applied to it) set optimizer_switch=default; diff --git a/mysql-test/main/subselect_mat_cost_bugs.result b/mysql-test/main/subselect_mat_cost_bugs.result index d63e1819fa8..c98ddd1e87e 100644 --- a/mysql-test/main/subselect_mat_cost_bugs.result +++ b/mysql-test/main/subselect_mat_cost_bugs.result @@ -302,7 +302,7 @@ set @@optimizer_switch=@save_optimizer_switch; drop table t1, t2; # # MWL#89: test introduced after Sergey Petrunia's review - test that -# keyparts wihtout index prefix are used with the IN-EXISTS strategy. +# keyparts without index prefix are used with the IN-EXISTS strategy. # create table t1 (c1 int); insert into t1 values (1), (2), (3); diff --git a/mysql-test/main/subselect_mat_cost_bugs.test b/mysql-test/main/subselect_mat_cost_bugs.test index 4174d18f396..17b907529bc 100644 --- a/mysql-test/main/subselect_mat_cost_bugs.test +++ b/mysql-test/main/subselect_mat_cost_bugs.test @@ -319,7 +319,7 @@ drop table t1, t2; --echo # --echo # MWL#89: test introduced after Sergey Petrunia's review - test that ---echo # keyparts wihtout index prefix are used with the IN-EXISTS strategy. +--echo # keyparts without index prefix are used with the IN-EXISTS strategy. --echo # create table t1 (c1 int); diff --git a/mysql-test/main/subselect_partial_match.result b/mysql-test/main/subselect_partial_match.result index 16a487445e4..2240fc8c926 100644 --- a/mysql-test/main/subselect_partial_match.result +++ b/mysql-test/main/subselect_partial_match.result @@ -7,7 +7,7 @@ set @@optimizer_switch = "materialization=on,in_to_exists=off,semijoin=off,subqu set @test_default_opt_switch = @@optimizer_switch; set @in_exists = "materialization=off,in_to_exists=on,semijoin=off,subquery_cache=off"; ------------------------------------------------------------------------- -Schema requires partial matching, but data analysis discoveres there is +Schema requires partial matching, but data analysis discovers there is no need. This is possible only if all outer columns are not NULL. ------------------------------------------------------------------------- create table t1 (a1 char(8) not null, a2 char(8) not null); @@ -29,7 +29,7 @@ a1 a2 in_res 1 - 01 2 - 01 NULL drop table t1, t2; ------------------------------------------------------------------------- -NULLs in the outer columns, no NULLs in the suqbuery +NULLs in the outer columns, no NULLs in the subquery ------------------------------------------------------------------------- create table t1 (a1 char(8), a2 char(8)); create table t2 (b1 char(8) not null, b2 char(8) not null); @@ -517,7 +517,7 @@ id select_type table type possible_keys key key_len ref rows Extra 2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 35 Using where SELECT * from t1 where (a1, a2, a3, a4) NOT IN (select * from t2); a1 a2 a3 a4 -change the mathcing row to be the last one in the first bitmap word +change the matching row to be the last one in the first bitmap word update t2 set b2 = 'zz' where b1 = 33; update t2 set b2 = NULL where b1 = 31; set @@optimizer_switch='partial_match_rowid_merge=on,partial_match_table_scan=off'; diff --git a/mysql-test/main/subselect_partial_match.test b/mysql-test/main/subselect_partial_match.test index 9a32ef5491c..5135c76c9e5 100644 --- a/mysql-test/main/subselect_partial_match.test +++ b/mysql-test/main/subselect_partial_match.test @@ -16,7 +16,7 @@ set @test_default_opt_switch = @@optimizer_switch; set @in_exists = "materialization=off,in_to_exists=on,semijoin=off,subquery_cache=off"; --echo ------------------------------------------------------------------------- ---echo Schema requires partial matching, but data analysis discoveres there is +--echo Schema requires partial matching, but data analysis discovers there is --echo no need. This is possible only if all outer columns are not NULL. --echo ------------------------------------------------------------------------- @@ -40,7 +40,7 @@ select a1, a2, (a1, a2) not in (select * from t2) as in_res from t1; drop table t1, t2; --echo ------------------------------------------------------------------------- ---echo NULLs in the outer columns, no NULLs in the suqbuery +--echo NULLs in the outer columns, no NULLs in the subquery --echo ------------------------------------------------------------------------- create table t1 (a1 char(8), a2 char(8)); @@ -380,7 +380,7 @@ EXPLAIN SELECT * from t1 where (a1, a2, a3, a4) NOT IN (select * from t2); SELECT * from t1 where (a1, a2, a3, a4) NOT IN (select * from t2); ---echo change the mathcing row to be the last one in the first bitmap word +--echo change the matching row to be the last one in the first bitmap word update t2 set b2 = 'zz' where b1 = 33; update t2 set b2 = NULL where b1 = 31; diff --git a/mysql-test/main/subselect_sj2_mat.result b/mysql-test/main/subselect_sj2_mat.result index 91a386cfc1b..4fbe31c8803 100644 --- a/mysql-test/main/subselect_sj2_mat.result +++ b/mysql-test/main/subselect_sj2_mat.result @@ -1648,7 +1648,7 @@ DROP TABLE t1,t2,t3,t4; set optimizer_switch=@save_optimizer_switch; # # mdev-4177: materialization of a subquery whose WHERE condition is OR -# formula with two disjucts such that the second one is always false +# formula with two disjuncts such that the second one is always false # set @save_optimizer_switch=@@optimizer_switch; set @save_join_cache_level=@@join_cache_level; diff --git a/mysql-test/main/subselect_sj2_mat.test b/mysql-test/main/subselect_sj2_mat.test index dca794f94db..bd13742fc87 100644 --- a/mysql-test/main/subselect_sj2_mat.test +++ b/mysql-test/main/subselect_sj2_mat.test @@ -230,7 +230,7 @@ set optimizer_switch=@save_optimizer_switch; --echo # --echo # mdev-4177: materialization of a subquery whose WHERE condition is OR ---echo # formula with two disjucts such that the second one is always false +--echo # formula with two disjuncts such that the second one is always false --echo # set @save_optimizer_switch=@@optimizer_switch; diff --git a/mysql-test/main/subselect_sj_nonmerged.test b/mysql-test/main/subselect_sj_nonmerged.test index 689e922ad24..1c35dde7928 100644 --- a/mysql-test/main/subselect_sj_nonmerged.test +++ b/mysql-test/main/subselect_sj_nonmerged.test @@ -15,7 +15,7 @@ create table t0 (a int); insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); -# Check the case of subquery having agggregates but not having grouping +# Check the case of subquery having aggregates but not having grouping create table t1 as select * from t0; --echo # The following should use full scan on and it must scan 1 row: diff --git a/mysql-test/main/sysdate_is_now.test b/mysql-test/main/sysdate_is_now.test index 166914e20c8..04ef86f7be2 100644 --- a/mysql-test/main/sysdate_is_now.test +++ b/mysql-test/main/sysdate_is_now.test @@ -3,7 +3,7 @@ # this feature is activated via --sysdate-is-now mysqld init opt # # To test here -# 1. SYSDATE() does not distiguish from NOW() +# 1. SYSDATE() does not distinguish from NOW() # 2. SYSDATE() obeys set timestamp set timestamp=1; diff --git a/mysql-test/main/table_options.result b/mysql-test/main/table_options.result index 5987b23dc6f..f6ff743adda 100644 --- a/mysql-test/main/table_options.result +++ b/mysql-test/main/table_options.result @@ -12,7 +12,7 @@ t1 CREATE TABLE `t1` ( KEY `akey` (`a`) `dff`=vvv ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci `tkey1`='1v1' drop table t1; -#reassiginig options in the same line +#reassigning options in the same line create table t1 (a int fkey=vvv, key akey (a) dff=vvv) tkey1=1v1 TKEY1=DEFAULT tkey1=1v2 tkey2=2v1; Warnings: Warning 1911 Unknown option 'fkey' diff --git a/mysql-test/main/table_options.test b/mysql-test/main/table_options.test index 0605ce9ee0d..db17011a6b1 100644 --- a/mysql-test/main/table_options.test +++ b/mysql-test/main/table_options.test @@ -5,7 +5,7 @@ create table t1 (a int fkey=vvv, key akey (a) dff=vvv) tkey1='1v1'; show create table t1; drop table t1; ---echo #reassiginig options in the same line +--echo #reassigning options in the same line create table t1 (a int fkey=vvv, key akey (a) dff=vvv) tkey1=1v1 TKEY1=DEFAULT tkey1=1v2 tkey2=2v1; show create table t1; diff --git a/mysql-test/main/tc_heuristic_recover.test b/mysql-test/main/tc_heuristic_recover.test index a31c29c8c93..a5242be5cfb 100644 --- a/mysql-test/main/tc_heuristic_recover.test +++ b/mysql-test/main/tc_heuristic_recover.test @@ -18,7 +18,7 @@ call mtr.add_suppression("Can't init tc log"); call mtr.add_suppression("Found 1 prepared transactions!"); call mtr.add_suppression("Aborting"); -# Now take a shapshot of the last time server options. +# Now take a snapshot of the last time server options. # # The "restart" expect-file facility can't be engaged because the server # having conflicting options may not succeed to boot up. diff --git a/mysql-test/main/timezone2.test b/mysql-test/main/timezone2.test index aba69d2081f..a226579c968 100644 --- a/mysql-test/main/timezone2.test +++ b/mysql-test/main/timezone2.test @@ -40,7 +40,7 @@ create table t1 (i int, ts timestamp); set time_zone='MET'; -# We check common date time value and non existent or ambiguios values +# We check common date time value and non existent or ambiguous values # Normal value without DST insert into t1 (i, ts) values (unix_timestamp('2003-03-01 00:00:00'),'2003-03-01 00:00:00'); @@ -263,7 +263,7 @@ INSERT INTO t1 VALUES (NULL), (NULL); LOCK TABLES t1 WRITE; # The following two queries should not return error that time zone -# tables aren't locked. We use IS NULL below to supress timestamp +# tables aren't locked. We use IS NULL below to suppress timestamp # result. SELECT CONVERT_TZ(NOW(), 'UTC', 'Europe/Moscow') IS NULL; UPDATE t1 SET t = CONVERT_TZ(t, 'UTC', 'Europe/Moscow'); @@ -503,7 +503,7 @@ SELECT * FROM t1 WHERE a = (SELECT MIN(b) FROM t1); SELECT * FROM t1 WHERE a IN ((SELECT MAX(b) FROM t1), (SELECT MIN(b) FROM t1)); DROP TABLE t1; -# Comparison and IN in combinarion with a subquery (with multiple rows) +# Comparison and IN in combination with a subquery (with multiple rows) SET time_zone='+00:00'; CREATE TABLE t1 (a TIMESTAMP, b TIMESTAMP); INSERT INTO t1 VALUES (FROM_UNIXTIME(1100000000),FROM_UNIXTIME(1200000000)); diff --git a/mysql-test/main/tmp_space_usage.test b/mysql-test/main/tmp_space_usage.test index 23a678270fa..c450e5de2eb 100644 --- a/mysql-test/main/tmp_space_usage.test +++ b/mysql-test/main/tmp_space_usage.test @@ -164,7 +164,7 @@ insert into t1 (a,v) select seq, repeat(char(64+mod(seq,32)),mod(seq,254)+1) fro show warnings; select count(*) <> 0 from t1; -# Shhow that this problem does not exists with transactional tables +# Show that this problem does not exists with transactional tables truncate table t1; alter table t1 engine=innodb; --error 41,42 diff --git a/mysql-test/main/trigger-compat.result b/mysql-test/main/trigger-compat.result index 7f77b368ca4..78ca55fa827 100644 --- a/mysql-test/main/trigger-compat.result +++ b/mysql-test/main/trigger-compat.result @@ -134,7 +134,7 @@ CREATE TABLE t1 ( a INT ); CREATE TABLE t2 ( a INT ); INSERT INTO t1 VALUES (1), (2), (3); INSERT INTO t2 VALUES (1), (2), (3); -# We write three trigger files. First trigger is syntaxically incorrect, next trigger is correct +# We write three trigger files. First trigger is syntactically incorrect, next trigger is correct # and last trigger is broken. # Next we try to execute SHOW CREATE TRIGGER command for broken trigger and then try to drop one. FLUSH TABLE t1; diff --git a/mysql-test/main/trigger-compat.test b/mysql-test/main/trigger-compat.test index f927a744c0a..d3402d8c7e7 100644 --- a/mysql-test/main/trigger-compat.test +++ b/mysql-test/main/trigger-compat.test @@ -258,7 +258,7 @@ CREATE TABLE t2 ( a INT ); INSERT INTO t1 VALUES (1), (2), (3); INSERT INTO t2 VALUES (1), (2), (3); ---echo # We write three trigger files. First trigger is syntaxically incorrect, next trigger is correct +--echo # We write three trigger files. First trigger is syntactically incorrect, next trigger is correct --echo # and last trigger is broken. --echo # Next we try to execute SHOW CREATE TRIGGER command for broken trigger and then try to drop one. --write_file $MYSQLD_DATADIR/test/tr11.TRN diff --git a/mysql-test/main/trigger.test b/mysql-test/main/trigger.test index 32c312c389d..81574afd9c7 100644 --- a/mysql-test/main/trigger.test +++ b/mysql-test/main/trigger.test @@ -625,7 +625,7 @@ select @a; --replace_column 6 # show triggers; drop table t1; -# check that rigger preserve sql_mode during execution +# check that trigger preserves sql_mode during execution set sql_mode="traditional"; create table t1 (a date); -- error 1292 @@ -2830,7 +2830,7 @@ create table t1 (a int); --copy_file $MYSQLD_DATADIR/test/t1_trg.TMP $MYSQLD_DATADIR/test/t1_trg.TRN drop trigger t1_trg; -# Test creating an additonal trigger for t1, but with different names +# Test creating an additional trigger for t1, but with different names delimiter |; create trigger t1_trg_2 before insert on t1 for each row begin diff --git a/mysql-test/main/trigger_notembedded.test b/mysql-test/main/trigger_notembedded.test index 4f277dc2c3d..6e502e33d4a 100644 --- a/mysql-test/main/trigger_notembedded.test +++ b/mysql-test/main/trigger_notembedded.test @@ -383,11 +383,11 @@ CREATE DATABASE mysqltest_db1; use mysqltest_db1; -# Tables for tesing table-level privileges: +# Tables for testing table-level privileges: CREATE TABLE t1(col CHAR(20)); # table for "read-value" trigger CREATE TABLE t2(col CHAR(20)); # table for "write-value" trigger -# Tables for tesing column-level privileges: +# Tables for testing column-level privileges: CREATE TABLE t3(col CHAR(20)); # table for "read-value" trigger CREATE TABLE t4(col CHAR(20)); # table for "write-value" trigger @@ -400,7 +400,7 @@ SET @mysqltest_var = NULL; --connect (bug15166_u1_con,localhost,mysqltest_u1,,mysqltest_db1) # parsing (CREATE TRIGGER) time: -# - check that nor SELECT either UPDATE is required to execute triggger w/o +# - check that nor SELECT either UPDATE is required to execute trigger w/o # NEW/OLD variables. --connection default @@ -631,7 +631,7 @@ INSERT INTO t4 VALUES('t4_line2'); SELECT * FROM t4; # execution time: -# - check that nor SELECT either UPDATE is required to execute triggger w/o +# - check that nor SELECT either UPDATE is required to execute trigger w/o # NEW/OLD variables. DELETE FROM t1; diff --git a/mysql-test/main/trigger_wl3253.result b/mysql-test/main/trigger_wl3253.result index b31f6c5622e..2a1a0428182 100644 --- a/mysql-test/main/trigger_wl3253.result +++ b/mysql-test/main/trigger_wl3253.result @@ -280,8 +280,8 @@ tr2_bu 2 DROP TABLE t1; # # Test 16. -# Check that the trigger in the clause FOLLOWS/PRECEDES can refences -# only to the trigger for the same ACTION/TIMINMG +# Check that the trigger in the clause FOLLOWS/PRECEDES can reference +# only to the trigger for the same ACTION/TIMING # CREATE TABLE t1 (a INT); CREATE TRIGGER tr1_bi BEFORE INSERT ON t1 FOR EACH ROW SET @a:=1; diff --git a/mysql-test/main/trigger_wl3253.test b/mysql-test/main/trigger_wl3253.test index 595786ae8d6..f94462f8dd3 100644 --- a/mysql-test/main/trigger_wl3253.test +++ b/mysql-test/main/trigger_wl3253.test @@ -304,8 +304,8 @@ DROP TABLE t1; --echo # --echo # Test 16. ---echo # Check that the trigger in the clause FOLLOWS/PRECEDES can refences ---echo # only to the trigger for the same ACTION/TIMINMG +--echo # Check that the trigger in the clause FOLLOWS/PRECEDES can reference +--echo # only to the trigger for the same ACTION/TIMING --echo # CREATE TABLE t1 (a INT); diff --git a/mysql-test/main/type_datetime.test b/mysql-test/main/type_datetime.test index c5991c01508..8d245ec6fd1 100644 --- a/mysql-test/main/type_datetime.test +++ b/mysql-test/main/type_datetime.test @@ -444,7 +444,7 @@ set @@sql_mode= @org_mode; # # Bug #42146 - DATETIME fractional seconds parse error # -# show we trucate microseconds from the right -- special case: leftmost is 0 +# show we truncate microseconds from the right -- special case: leftmost is 0 SELECT CAST(CAST('2006-08-10 10:11:12.0123450' AS DATETIME(6)) AS DECIMAL(30,7)) as exp; # show that we ignore leading zeroes for all other fields diff --git a/mysql-test/main/type_float.result b/mysql-test/main/type_float.result index 413274748be..dfcb2c632e6 100644 --- a/mysql-test/main/type_float.result +++ b/mysql-test/main/type_float.result @@ -565,7 +565,7 @@ SELECT t1.* FROM t1 LEFT JOIN t2 USING(a); a 10:20:30.000000 10:20:30.000000 -# t2 should NOT be elimitated +# t2 should NOT be eliminated EXPLAIN SELECT t1.* FROM t1 LEFT JOIN t2 USING(a); id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 system NULL NULL NULL NULL 1 diff --git a/mysql-test/main/type_float.test b/mysql-test/main/type_float.test index e728d4e1ed7..882f51d2800 100644 --- a/mysql-test/main/type_float.test +++ b/mysql-test/main/type_float.test @@ -416,7 +416,7 @@ SELECT t1.* FROM t1 LEFT JOIN t2 USING(a); ALTER TABLE t2 ADD PRIMARY KEY(a); SELECT t1.* FROM t1 JOIN t2 USING(a); SELECT t1.* FROM t1 LEFT JOIN t2 USING(a); ---echo # t2 should NOT be elimitated +--echo # t2 should NOT be eliminated EXPLAIN SELECT t1.* FROM t1 LEFT JOIN t2 USING(a); DROP TABLE t1,t2; diff --git a/mysql-test/main/type_newdecimal.test b/mysql-test/main/type_newdecimal.test index 34273a19a67..69c1125f9ca 100644 --- a/mysql-test/main/type_newdecimal.test +++ b/mysql-test/main/type_newdecimal.test @@ -811,7 +811,7 @@ select 1 / 0; #BUG#1845 Not correctly recognising value for decimal field #BUG#2493 Round function doesn't work correctly #BUG#2649 round(0.5) gives 0 (should be 1) -#BUG#3612 impicite rounding of VARCHARS during aritchmetic operations... +#BUG#3612 impicite rounding of VARCHARS during arithmetic operations... #BUG#3722 SELECT fails for certain values in Double(255,10) column. #BUG#4485 Floating point conversions are inconsistent #BUG#4891 MATH @@ -1227,7 +1227,7 @@ DROP TABLE t1; # # As per 10.1.1. Overview of Numeric Types, type (new) DECIMAL has a -# maxmimum precision of 30 places after the decimal point. Show that +# maximum precision of 30 places after the decimal point. Show that # temp field creation beyond that works and throws a truncation warning. # DECIMAL(37,36) should be adjusted to DECIMAL(31,30). CREATE TABLE t1 SELECT 0.1234567890123456789012345678901234567890123456789 AS f1; diff --git a/mysql-test/main/type_timestamp.test b/mysql-test/main/type_timestamp.test index e413e7302a0..95834f32ea6 100644 --- a/mysql-test/main/type_timestamp.test +++ b/mysql-test/main/type_timestamp.test @@ -163,7 +163,7 @@ drop table t1; # Let us test if CURRENT_TIMESTAMP also works well as default value # (Of course NOW and CURRENT_TIMESTAMP are same for parser but still just -# for demonstartion.) +# for demonstration.) create table t1 (t1 timestamp not null default current_timestamp on update current_timestamp, t2 datetime); SET TIMESTAMP=1000000009; insert into t1 values (); @@ -977,7 +977,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE a=TIMESTAMP'1970-01-01 00:00:00'; EXPLAIN EXTENDED SELECT * FROM t1 WHERE a=TIMESTAMP'1970-01-01 23:59:59'; EXPLAIN EXTENDED SELECT * FROM t1 WHERE a=TIMESTAMP'1970-01-01 23:59:59.999999'; -# Truncation of the 7th flactional digit produces a NOTE only without --ps +# Truncation of the 7th fractional digit produces a NOTE only without --ps --disable_ps_protocol EXPLAIN EXTENDED SELECT * FROM t1 WHERE a=TIMESTAMP'1970-01-01 23:59:59.9999999'; --enable_ps_protocol diff --git a/mysql-test/main/udf.test b/mysql-test/main/udf.test index 11717eb43b1..7d5712beb9f 100644 --- a/mysql-test/main/udf.test +++ b/mysql-test/main/udf.test @@ -248,7 +248,7 @@ DROP FUNCTION avgcost; # the UDF # -#enable view prtotocol after fix MDEV-28677 +#enable view protocol after fix MDEV-28677 --disable_view_protocol #check after fix MDEV-31587 --disable_cursor_protocol diff --git a/mysql-test/main/union.result b/mysql-test/main/union.result index 7c7025ee2de..aeb57256784 100644 --- a/mysql-test/main/union.result +++ b/mysql-test/main/union.result @@ -2782,7 +2782,7 @@ drop table t1; # End of 10.3 tests # -# check union all & union disctinct +# check union all & union distinct select 1 as res union select 2 union select 1 union select 2; res diff --git a/mysql-test/main/union.test b/mysql-test/main/union.test index 264b4852194..908da6b1e1a 100644 --- a/mysql-test/main/union.test +++ b/mysql-test/main/union.test @@ -2030,7 +2030,7 @@ drop table t1; --echo # --echo ---echo # check union all & union disctinct +--echo # check union all & union distinct --echo select 1 as res union select 2 union select 1 union select 2; diff --git a/mysql-test/main/user_limits.test b/mysql-test/main/user_limits.test index 10e15ca3c9c..fcc244302cd 100644 --- a/mysql-test/main/user_limits.test +++ b/mysql-test/main/user_limits.test @@ -166,7 +166,7 @@ select * from t1; --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK --error ER_TOO_MANY_USER_CONNECTIONS connect (muca3, localhost, mysqltest_1,,); -# Now we are testing that per-account limit prevails over gloabl limit +# Now we are testing that per-account limit prevails over global limit connection default; grant usage on *.* to mysqltest_1@localhost with max_user_connections 3; flush user_resources; diff --git a/mysql-test/main/user_var.test b/mysql-test/main/user_var.test index 5a88c888d1d..3141490c7a1 100644 --- a/mysql-test/main/user_var.test +++ b/mysql-test/main/user_var.test @@ -505,7 +505,7 @@ DROP TABLE t1; --echo # --disable_service_connection -# Execute twice so number stablizes a bit +# Execute twice so number stabilizes a bit let $tmp= `select memory_used from information_schema.processlist`; set @var= repeat('a',30000); let $tmp2= `select memory_used from information_schema.processlist`; diff --git a/mysql-test/main/view.test b/mysql-test/main/view.test index 0c6b25a1498..50ce975f93c 100644 --- a/mysql-test/main/view.test +++ b/mysql-test/main/view.test @@ -274,7 +274,7 @@ drop view v1,v2; create table t1 (a int, b int, primary key(b)); insert into t1 values (1,20), (2,30), (3,40), (4,50), (5,100); create view v1 (c) as select b from t1 where a<3; -# simple select and explaint to be sure that it is MERGE +# simple select and explain to be sure that it is MERGE select * from v1; explain extended select * from v1; # update test @@ -495,7 +495,7 @@ drop view v1; create view v1 (a,a) as select 'a','a'; # -# updatablity should be transitive +# updatability should be transitive # create table t1 (col1 int,col2 char(22)); insert into t1 values(5,'Hello, world of views'); @@ -1117,7 +1117,7 @@ drop view v1; drop table t1; # -# test of cascaded check option for whiew without WHERE clause +# test of cascaded check option for view without WHERE clause # create table t1 (s1 tinyint); create view v1 as select * from t1 where s1 <> 0 with local check option; @@ -1202,7 +1202,7 @@ drop view v1; drop table t1; # -# Trys update table from which we select using views and subqueries +# Try update table from which we select using views and subqueries # create table t1 (s1 smallint); create view v1 as select * from t1 where 20 < (select (s1) from t1); @@ -1720,7 +1720,7 @@ drop view v1; drop table t1; # -# hide underlying tables names in case of imposibility to update (Bug#10773) +# hide underlying tables names in case of impossibility to update (Bug#10773) # create table t1 (f59 int, f60 int, f61 int); insert into t1 values (19,41,32); diff --git a/mysql-test/main/view_alias.result b/mysql-test/main/view_alias.result index 384deeb2b99..420d4c342ad 100644 --- a/mysql-test/main/view_alias.result +++ b/mysql-test/main/view_alias.result @@ -80,7 +80,7 @@ CREATE VIEW v1 AS SELECT 'c1', 'c2 ', ' c3', ' c4 ', 'Name_exp_2'; DROP VIEW v1; CREATE VIEW v1 AS select 'c1' AS `c1`,'c2 ' AS `Name_exp_2`,' c3' AS `c3`,' c4 ' AS `Name_exp_4`,'Name_exp_2' AS `My_exp_Name_exp_2`; DROP VIEW v1; -# Invalid conlumn name in subquery. +# Invalid column name in subquery. CREATE VIEW v1 AS SELECT (SELECT ' c1 '); DROP VIEW v1; CREATE VIEW v1 AS select (select ' c1 ') AS `(SELECT ' c1 ')`; diff --git a/mysql-test/main/view_alias.test b/mysql-test/main/view_alias.test index 09d707296bb..ae7b8158c28 100644 --- a/mysql-test/main/view_alias.test +++ b/mysql-test/main/view_alias.test @@ -56,7 +56,7 @@ DROP VIEW v1; eval CREATE VIEW v1 AS $query; DROP VIEW v1; ---echo # Invalid conlumn name in subquery. +--echo # Invalid column name in subquery. CREATE VIEW v1 AS SELECT (SELECT ' c1 '); let $query = `SELECT VIEW_DEFINITION FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME = 'v1'`; DROP VIEW v1; diff --git a/mysql-test/main/view_grant.test b/mysql-test/main/view_grant.test index 765bc3ea7a4..70981e31654 100644 --- a/mysql-test/main/view_grant.test +++ b/mysql-test/main/view_grant.test @@ -149,7 +149,7 @@ select c from mysqltest.v3; select c from mysqltest.v4; --error ER_TABLEACCESS_DENIED_ERROR select c from mysqltest.v5; -# test of show coluns +# test of show columns show columns from mysqltest.v1; show columns from mysqltest.v2; # explain/show fail @@ -485,7 +485,7 @@ drop database mysqltest; disconnect user1; # -# rights on execution of view underlying functiond (Bug#9505) +# rights on execution of view underlying functions (Bug#9505) # connection root; --disable_warnings diff --git a/mysql-test/main/win.result b/mysql-test/main/win.result index 7c7da702569..028caa7ac40 100644 --- a/mysql-test/main/win.result +++ b/mysql-test/main/win.result @@ -836,7 +836,7 @@ pk a b bit_or 12 2 2048 2048 drop table t2; # -# Try RANGE PRECEDING|FOLLWING n +# Try RANGE PRECEDING|FOLLOWING n # create table t1 ( part_id int, diff --git a/mysql-test/main/win.test b/mysql-test/main/win.test index ccffc045afc..ee5729ad935 100644 --- a/mysql-test/main/win.test +++ b/mysql-test/main/win.test @@ -554,7 +554,7 @@ from t2; drop table t2; --echo # ---echo # Try RANGE PRECEDING|FOLLWING n +--echo # Try RANGE PRECEDING|FOLLOWING n --echo # create table t1 ( part_id int, @@ -2812,7 +2812,7 @@ FROM t1 GROUP BY nullif(id, 15532); drop table t1; -#Dublicate warnings +#Duplicate warnings --disable_view_protocol CREATE TABLE t1 ( a char(25), b text); INSERT INTO t1 VALUES ('foo','bar'); diff --git a/mysql-test/main/xml.test b/mysql-test/main/xml.test index 2d0dd9907bb..efe8f7e1cac 100644 --- a/mysql-test/main/xml.test +++ b/mysql-test/main/xml.test @@ -382,7 +382,7 @@ select extractValue('DataOtherdata<01>10:39:15<02>140','/zot/tim0/02') as xml; select extractValue('<01>10:39:15<02>140','//*') as xml; -# dot and dash are bad identtifier start character +# dot and dash are bad identifier start character select extractValue('<.>test','//*'); select extractValue('<->test','//*'); # semicolon is good identifier start character diff --git a/mysql-test/main/xtradb_mrr.result b/mysql-test/main/xtradb_mrr.result index b99d34890f0..2aa2002b902 100644 --- a/mysql-test/main/xtradb_mrr.result +++ b/mysql-test/main/xtradb_mrr.result @@ -759,7 +759,7 @@ set optimizer_switch='mrr=off'; explain select * from t1 where b > 1000; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range idx idx 5 NULL 1 Using index condition -# The following two must produce indentical results: +# The following two must produce identical results: select * from t1 where pk < 2 or pk between 3 and 4; pk b c 3 30 0 diff --git a/mysql-test/main/xtradb_mrr.test b/mysql-test/main/xtradb_mrr.test index c6d54d316c2..5a1023bfb3b 100644 --- a/mysql-test/main/xtradb_mrr.test +++ b/mysql-test/main/xtradb_mrr.test @@ -382,7 +382,7 @@ insert into t1(pk,b) values (3, 30), (2, 20), (9, 90), (7, 70), (4, 40), (5, 50) set @bug665669_tmp=@@optimizer_switch; set optimizer_switch='mrr=off'; explain select * from t1 where b > 1000; ---echo # The following two must produce indentical results: +--echo # The following two must produce identical results: select * from t1 where pk < 2 or pk between 3 and 4; select * from t1 where pk < 2 or pk between 3 and 4; drop table t1; diff --git a/mysql-test/mariadb-stress-test.pl b/mysql-test/mariadb-stress-test.pl index 3ccf965024d..d2026dbdd19 100755 --- a/mysql-test/mariadb-stress-test.pl +++ b/mysql-test/mariadb-stress-test.pl @@ -149,19 +149,19 @@ $client_ip=~ s/\.//g; %tests_files=(client => {mtime => 0, data => []}, initdb => {mtime => 0, data => []}); -# Error codes and sub-strings with corresponding severity +# Error codes and sub-strings with corresponding severity # # S1 - Critical errors - cause immediately abort of testing. These errors # could be caused by server crash or impossibility # of test execution. # -# S2 - Serious errors - these errors are bugs for sure as it knowns that -# they shouldn't appear during stress testing +# S2 - Serious errors - these errors are bugs for sure as it's known that +# they shouldn't appear during stress testing # -# S3 - Unknown errors - Errors were returned but we don't know what they are +# S3 - Unknown errors - Errors were returned but we don't know what they are # so script can't determine if they are OK or not # -# S4 - Non-seriuos errros - these errors could be caused by fact that +# S4 - Non-seriuos errors - these errors could be caused by fact that # we execute simultaneously statements that # affect tests executed by other threads @@ -414,7 +414,7 @@ if (!defined($opt_stress_tests_file) && !defined($opt_stress_init_file)) { die < --stress-suite-basedir= --serve they specified in the list file. --sleep-time=