Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions BUILD-CMAKE
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion BUILD/SETUP.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion BUILD/compile-pentium32-gcov
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion cmake/aws_sdk.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion cmake/pcre.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion configure.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion debian/autobake-deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion extra/mariabackup/fil_cur.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion extra/mariabackup/fil_cur.h
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion extra/mariabackup/innobackupex.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion extra/mariabackup/xbcloud.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
8 changes: 4 additions & 4 deletions extra/mariabackup/xtrabackup.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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())) {
Expand Down
2 changes: 1 addition & 1 deletion extra/perror.c
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ int main(int argc,char *argv[])
code=atoi(*argv);
msg = strerror(code);

// On AIX, unknow error return " Error <CODE> occurred."
// On AIX, unknown error return " Error <CODE> occurred."
snprintf(unknow_aix, sizeof(unknow_aix), " Error %3d occurred.", code);

/*
Expand Down
2 changes: 1 addition & 1 deletion extra/readline/histexpand.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion extra/replace.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion include/json_lib.h
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
2 changes: 1 addition & 1 deletion include/my_base.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion include/myisam.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/sys_vars/r/sysvars_innodb.result
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion storage/connect/odbconn.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion storage/innobase/handler/ha_innodb.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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[]= {
Expand Down