diff --git a/BUILD-CMAKE b/BUILD-CMAKE index aedce4400c6e8..d083d599914b3 100644 --- a/BUILD-CMAKE +++ b/BUILD-CMAKE @@ -105,7 +105,7 @@ CONFIGURATION PARAMETERS --------------------------------------------------------------- The procedure above will build with default configuration. -Let's you want to change the configuration parameters and have archive +Lets you want to change the configuration parameters and have archive storage engine compiled into the server instead of building it as pluggable module. @@ -115,7 +115,7 @@ shell> cmake . -DWITH_ARCHIVE_STORAGE_ENGINE=1 This can be done during the initial configuration or any time later. -Note, that parameters are "sticky", that is they are remebered in the CMake +Note, that parameters are "sticky", that is they are remembered in the CMake cache (CMakeCache.txt file in the build directory) 2) Configuration using cmake-gui (Windows, OSX, or Linux with cmake-gui diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index b62497333c3e3..fba28e1e91011 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -280,7 +280,7 @@ fi # (returns 0 if finds lines) # As cmake doesn't like CC and CXX with a space, use symlinks from -# /usr/lib64/ccache if they exits. +# /usr/lib64/ccache if they exist. if ccache -V > /dev/null 2>&1 && test "$CCACHE_DISABLE" != "1" && test "$CC" = "gcc" then diff --git a/BUILD/compile-pentium32-gcov b/BUILD/compile-pentium32-gcov index 44b672b256c7c..360a8d92f5d68 100755 --- a/BUILD/compile-pentium32-gcov +++ b/BUILD/compile-pentium32-gcov @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA -# Need to disable ccache, or we loose the gcov-needed compiler output files. +# Need to disable ccache, or we lose the gcov-needed compiler output files. USING_GCOV=1 CCACHE_GCOV_VERSION_ENABLED=0 diff --git a/CMakeLists.txt b/CMakeLists.txt index 9da615232e8dc..6a522d9df2923 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,7 +63,7 @@ IF(UNIX AND NOT APPLE) # the empty CMAKE_BUILD_TYPE) and the build many times for # different build types without re-running cmake! # But we only care about WITH_PIC on Unix, where the check for - # CMAKE_BUILD_TYPE hapen to work. + # CMAKE_BUILD_TYPE happen to work. IF (CMAKE_BUILD_TYPE MATCHES "Debug") SET(WITH_PIC_DEFAULT ON) ELSE() diff --git a/cmake/aws_sdk.cmake b/cmake/aws_sdk.cmake index a0d46e1a89257..e24a141cd1a8c 100644 --- a/cmake/aws_sdk.cmake +++ b/cmake/aws_sdk.cmake @@ -43,7 +43,7 @@ FUNCTION (CHECK_AWS_SDK RETVAL REASON) ENDIF() IF(UNIX) - # Check librairies required for building SDK + # Check libraries required for building SDK FIND_PACKAGE(CURL) SET_PACKAGE_PROPERTIES(CURL PROPERTIES TYPE REQUIRED) IF(NOT CURL_FOUND) diff --git a/cmake/pcre.cmake b/cmake/pcre.cmake index 9ebab4e66fee0..8643c988c1ae2 100644 --- a/cmake/pcre.cmake +++ b/cmake/pcre.cmake @@ -33,7 +33,7 @@ MACRO(BUNDLE_PCRE2) SET(file ${dir}/src/pcre2-build/${intdir}${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${PCRE_STATIC}${CMAKE_STATIC_LIBRARY_SUFFIX}) IF(WIN32) - # Debug libary name. + # Debug library name. # Same condition as in pcre2 CMakeLists.txt that adds "d" SET(file_d ${dir}/src/pcre2-build/${intdir}${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${PCRE_STATIC}d${CMAKE_STATIC_LIBRARY_SUFFIX}) SET_TARGET_PROPERTIES(${lib} PROPERTIES IMPORTED_LOCATION_DEBUG ${file_d}) diff --git a/configure.cmake b/configure.cmake index 0aaac0c5321b0..43726249c106c 100644 --- a/configure.cmake +++ b/configure.cmake @@ -731,7 +731,7 @@ IF(NOT C_HAS_inline) SET(C_INLINE __inline) ElSE() SET(C_INLINE) - MESSAGE(WARNING "C compiler does not support funcion inlining") + MESSAGE(WARNING "C compiler does not support function inlining") IF(NOT NOINLINE) MESSAGE(FATAL_ERROR "Use -DNOINLINE=TRUE to allow compilation without inlining") ENDIF() diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 8bb4375256bff..4eaf3c98c3b70 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -168,7 +168,7 @@ fi # If running autobake-debs.sh inside docker/podman host machine which # has 64 bits cpu but container image is 32 bit make sure that we set -# correct arch with linux32 for 32 bit enviroment +# correct arch with linux32 for 32 bit environment if [ "$architecture" = "i386" ] && [ "$uname_machine" = "x86_64" ] then BUILDPACKAGE_DPKGCMD+=("linux32") diff --git a/extra/mariabackup/fil_cur.cc b/extra/mariabackup/fil_cur.cc index f5033deaf405e..d5cf86460fca2 100644 --- a/extra/mariabackup/fil_cur.cc +++ b/extra/mariabackup/fil_cur.cc @@ -47,7 +47,7 @@ specified possibly absolute path. For user tablespaces both "./database/table.ibd" and "/remote/dir/database/table.ibd" result in "database/table.ibd". -For system tablepsaces (i.e. When is_system is TRUE) both "/remote/dir/ibdata1" +For system tablespaces (i.e. When is_system is TRUE) both "/remote/dir/ibdata1" and "./ibdata1" yield "ibdata1" in the output. */ const char * xb_get_relative_path( diff --git a/extra/mariabackup/fil_cur.h b/extra/mariabackup/fil_cur.h index 641b90fa14eb9..6f7d2b3e42341 100644 --- a/extra/mariabackup/fil_cur.h +++ b/extra/mariabackup/fil_cur.h @@ -116,7 +116,7 @@ specified possibly absolute path. For user tablespaces both "./database/table.ibd" and "/remote/dir/database/table.ibd" result in "database/table.ibd". -For system tablepsaces (i.e. When is_system is TRUE) both "/remote/dir/ibdata1" +For system tablespaces (i.e. When is_system is TRUE) both "/remote/dir/ibdata1" and "./ibdata1" yield "ibdata1" in the output. */ const char * xb_get_relative_path( diff --git a/extra/mariabackup/innobackupex.cc b/extra/mariabackup/innobackupex.cc index 20f87354fd079..9ddfa0d5394d2 100644 --- a/extra/mariabackup/innobackupex.cc +++ b/extra/mariabackup/innobackupex.cc @@ -190,7 +190,7 @@ enum innobackupex_options OPT_DATABASES, OPT_DECOMPRESS, - /* options wich are passed directly to xtrabackup */ + /* options which are passed directly to xtrabackup */ OPT_CLOSE_FILES, OPT_COMPACT, OPT_COMPRESS, diff --git a/extra/mariabackup/xbcloud.cc b/extra/mariabackup/xbcloud.cc index 588a15eb791dd..0a2bcfc7acea1 100644 --- a/extra/mariabackup/xbcloud.cc +++ b/extra/mariabackup/xbcloud.cc @@ -213,7 +213,7 @@ static struct my_option my_long_options[] = GET_ENUM, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"swift-auth-version", OPT_SWIFT_AUTH_VERSION, - "Swift authentication verison to use.", + "Swift authentication version to use.", &opt_swift_auth_version, &opt_swift_auth_version, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 163d82fa807c9..63b2321d87f0c 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -212,7 +212,7 @@ uint xtrabackup_compress = FALSE; uint xtrabackup_compress_threads; ulonglong xtrabackup_compress_chunk_size = 0; -/* sleep interval beetween log copy iterations in log copying thread +/* sleep interval between log copy iterations in log copying thread in milliseconds (default is 1 second) */ ulint xtrabackup_log_copy_interval = 1000; static ulong max_buf_pool_modified_pct; @@ -3524,7 +3524,7 @@ xb_fil_io_init() @param[in] is_remote true if tablespace file is .isl @param[in] skip_node_page0 true if we don't need to read node page 0. Otherwise node page0 will be read, and it's size and free pages limit -will be set from page 0, what is neccessary for checking and fixing corrupted +will be set from page 0, what is necessary for checking and fixing corrupted pages. @param[in] defer_space_id use the space id to create space object when there is deferred tablespace @@ -5057,7 +5057,7 @@ This function handles DDL changes at the end of backup, under protection of FTWRL. This ensures consistent backup in presence of DDL. - New tables, that were created during backup, are now copied into backup. - Also, tablespaces with optimized (no redo loggin DDL) are re-copied into + Also, tablespaces with optimized (no redo logging DDL) are re-copied into backup. This tablespaces will get the extension ".new" in the backup - Tables that were renamed during backup, are marked as renamed @@ -5194,7 +5194,7 @@ void CorruptedPages::backup_fix_ddl(ds_ctxt *ds_data, ds_ctxt *ds_meta) } /* Mariabackup doesn't detect any FILE_OP for the deferred - tablespace. There is a possiblity that page0 could've + tablespace. There is a possibility that page0 could've been corrupted persistently in the disk */ for (auto space_name: defer_space_names) { if (!check_if_skip_table(space_name.c_str())) { diff --git a/extra/perror.c b/extra/perror.c index 4710b28035aae..0e1575edc56f8 100644 --- a/extra/perror.c +++ b/extra/perror.c @@ -322,7 +322,7 @@ int main(int argc,char *argv[]) code=atoi(*argv); msg = strerror(code); - // On AIX, unknow error return " Error occurred." + // On AIX, unknown error return " Error occurred." snprintf(unknow_aix, sizeof(unknow_aix), " Error %3d occurred.", code); /* diff --git a/extra/readline/histexpand.c b/extra/readline/histexpand.c index 38292c6045b7d..deb341d35af05 100644 --- a/extra/readline/histexpand.c +++ b/extra/readline/histexpand.c @@ -848,7 +848,7 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line) } i += 2; } - /* Done with modfiers. */ + /* Done with modifiers. */ /* Believe it or not, we have to back the pointer up by one. */ --i; diff --git a/extra/replace.c b/extra/replace.c index 8b20f812be005..ae04fe3203e80 100644 --- a/extra/replace.c +++ b/extra/replace.c @@ -342,7 +342,7 @@ typedef struct st_rep_set { uint found_len; /* Best match to date */ int found_offset; uint table_offset; - uint size_of_bits; /* For convinience */ + uint size_of_bits; /* For convenience */ } REP_SET; typedef struct st_rep_sets { diff --git a/include/json_lib.h b/include/json_lib.h index 998d4663610b9..a272e27d83d3e 100644 --- a/include/json_lib.h +++ b/include/json_lib.h @@ -35,7 +35,7 @@ typedef struct st_json_string_t const uchar *c_str; /* Current position in JSON string */ const uchar *str_end; /* The end on the string. */ my_wc_t c_next; /* UNICODE of the last read character */ - int c_next_len; /* character lenght of the last read character. */ + int c_next_len; /* character length of the last read character. */ int error; /* error code. */ CHARSET_INFO *cs; /* Character set of the JSON string. */ diff --git a/include/my_base.h b/include/my_base.h index 2ae107c4799b6..b7b09a2475c17 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -267,7 +267,7 @@ enum ha_base_keytype { Note that these can only be up to 16 bits! */ -#define HA_NOSAME 1U /* Set if not dupplicated records */ +#define HA_NOSAME 1U /* Set if not duplicated records */ #define HA_PACK_KEY 2U /* Pack string key to previous key */ #define HA_AUTO_KEY 16U /* MEMORY/MyISAM/Aria internal */ #define HA_BINARY_PACK_KEY 32U /* Packing of all keys to prev key */ diff --git a/include/myisam.h b/include/myisam.h index e75e25623ebc5..a7952988f78e1 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -134,7 +134,7 @@ typedef struct st_mi_isaminfo /* Struct from h_info */ char *data_file_name, *index_file_name; uint keys; /* Number of keys in use */ uint options; /* HA_OPTION_... used */ - int errkey, /* With key was dupplicated on err */ + int errkey, /* With key was duplicated on err */ sortkey; /* clustered by this key */ File filenr; /* (uniq) filenr for datafile */ time_t create_time; /* When table was created */ diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result index 3b95064abd32b..eff805bd45858 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result @@ -612,7 +612,7 @@ SESSION_VALUE NULL DEFAULT_VALUE OFF VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Enrypt the temporary table data. +VARIABLE_COMMENT Encrypt the temporary table data NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL diff --git a/storage/connect/odbconn.cpp b/storage/connect/odbconn.cpp index 1b35bfa360767..10a06662b28d4 100644 --- a/storage/connect/odbconn.cpp +++ b/storage/connect/odbconn.cpp @@ -281,7 +281,7 @@ static CATPARM *AllocCatInfo(PGLOBAL g, CATINFO fid, PCSZ db, cap->Status = (UWORD *)PlugSubAlloc(g, NULL, m * sizeof(UWORD)); } catch (int n) { - htrc("Exeption %d: %s\n", n, g->Message); + htrc("Exception %d: %s\n", n, g->Message); cap = NULL; } catch (const char *msg) { htrc(g->Message, msg); diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index d1bcde83b8077..74a6fedadfc14 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -19728,7 +19728,7 @@ static MYSQL_SYSVAR_BOOL(immediate_scrub_data_uncompressed, static MYSQL_SYSVAR_BOOL(encrypt_temporary_tables, innodb_encrypt_temporary_tables, PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY, - "Enrypt the temporary table data.", + "Encrypt the temporary table data", NULL, NULL, false); static struct st_mysql_sys_var* innobase_system_variables[]= {