summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
Diffstat (limited to 'storage')
-rw-r--r--storage/connect/filamzip.cpp2
-rw-r--r--storage/connect/ha_connect.cc4
-rw-r--r--storage/connect/javaconn.cpp2
-rw-r--r--storage/example/ha_example.cc4
-rw-r--r--storage/federatedx/AUTHORS2
-rw-r--r--storage/innobase/fil/fil0fil.cc2
-rw-r--r--storage/innobase/include/fil0fil.h2
-rw-r--r--storage/innobase/include/fil0fil.ic2
-rw-r--r--storage/innobase/row/row0sel.cc4
-rw-r--r--storage/innobase/srv/srv0mon.cc2
-rw-r--r--storage/maria/ha_maria.cc2
-rw-r--r--storage/maria/ma_close.c2
-rw-r--r--storage/maria/trnman.c2
-rw-r--r--storage/myisam/ha_myisam.cc2
-rw-r--r--storage/perfschema/pfs_timer.h2
-rw-r--r--storage/rocksdb/mysql-test/rocksdb/t/lock_rows_not_exist.test2
-rw-r--r--storage/sphinx/ha_sphinx.cc2
-rw-r--r--storage/tokudb/PerconaFT/ft/loader/loader.cc4
-rw-r--r--storage/tokudb/mysql-test/tokudb/t/type_bit.test2
19 files changed, 23 insertions, 23 deletions
diff --git a/storage/connect/filamzip.cpp b/storage/connect/filamzip.cpp
index e76dc496246..f7866b9dae1 100644
--- a/storage/connect/filamzip.cpp
+++ b/storage/connect/filamzip.cpp
@@ -700,7 +700,7 @@ bool UNZIPUTL::openEntry(PGLOBAL g)
} // endif rc
if (trace(1))
- htrc("Openning entry%s %s\n", fn, (entryopen) ? "oked" : "failed");
+ htrc("Opening entry%s %s\n", fn, (entryopen) ? "oked" : "failed");
return !entryopen;
} // end of openEntry
diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc
index 05d15b41728..85bf2090528 100644
--- a/storage/connect/ha_connect.cc
+++ b/storage/connect/ha_connect.cc
@@ -704,9 +704,9 @@ DllExport LPCSTR PlugSetPath(LPSTR to, LPCSTR name, LPCSTR dir)
used by the default rename_table and delete_table method in
handler.cc.
- For engines that have two file name extentions (separate meta/index file
+ For engines that have two file name extensions (separate meta/index file
and data file), the order of elements is relevant. First element of engine
- file name extentions array should be meta/index file extention. Second
+ file name extensions array should be meta/index file extention. Second
element - data file extention. This order is assumed by
prepare_for_repair() when REPAIR TABLE ... USE_FRM is issued.
diff --git a/storage/connect/javaconn.cpp b/storage/connect/javaconn.cpp
index f919344f20b..e3f64d17064 100644
--- a/storage/connect/javaconn.cpp
+++ b/storage/connect/javaconn.cpp
@@ -142,7 +142,7 @@ bool JAVAConn::Check(jint rc)
s = (jstring)env->CallObjectMethod(exc, tid);
Msg = GetUTFString(s);
} else
- Msg = "Exception occured";
+ Msg = "Exception occurred";
env->ExceptionClear();
} else if (rc < 0) {
diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc
index 643fa1ae09a..ab402c636d1 100644
--- a/storage/example/ha_example.cc
+++ b/storage/example/ha_example.cc
@@ -225,9 +225,9 @@ static void init_example_psi_keys()
used by the default rename_table and delete_table method in
handler.cc and by the default discover_many method.
- For engines that have two file name extentions (separate meta/index file
+ For engines that have two file name extensions (separate meta/index file
and data file), the order of elements is relevant. First element of engine
- file name extentions array should be meta/index file extention. Second
+ file name extensions array should be meta/index file extention. Second
element - data file extention. This order is assumed by
prepare_for_repair() when REPAIR TABLE ... USE_FRM is issued.
diff --git a/storage/federatedx/AUTHORS b/storage/federatedx/AUTHORS
index 6314d2e4a3d..cdd6600fb5a 100644
--- a/storage/federatedx/AUTHORS
+++ b/storage/federatedx/AUTHORS
@@ -7,5 +7,5 @@ Pluggable Storage Engine Skeleton setup
Brian Aker <brian@mysql.com> | <brian@tangent.org> - Original Design
Calvin Sun - Windows Support
Brian Miezejewski - Bug fixes
-Antony T Curtis - Help in inital development, transactions and various help
+Antony T Curtis - Help in initial development, transactions and various help
Michael Widenius - Bug fixes and some simple early optimizations
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
index e22b1c4e314..8ccebff3db0 100644
--- a/storage/innobase/fil/fil0fil.cc
+++ b/storage/innobase/fil/fil0fil.cc
@@ -155,7 +155,7 @@ current working directory ".", but in the MySQL Embedded Server Library
it is an absolute path. */
const char* fil_path_to_mysql_datadir;
-/** Common InnoDB file extentions */
+/** Common InnoDB file extensions */
const char* dot_ext[] = { "", ".ibd", ".isl", ".cfg" };
/** The number of fsyncs done to the log */
diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h
index 0818d3f0ed1..204b199c85a 100644
--- a/storage/innobase/include/fil0fil.h
+++ b/storage/innobase/include/fil0fil.h
@@ -350,7 +350,7 @@ struct fil_node_t {
/** Value of fil_node_t::magic_n */
#define FIL_NODE_MAGIC_N 89389
-/** Common InnoDB file extentions */
+/** Common InnoDB file extensions */
enum ib_extention {
NO_EXT = 0,
IBD = 1,
diff --git a/storage/innobase/include/fil0fil.ic b/storage/innobase/include/fil0fil.ic
index 457b5e1a03e..31466f38546 100644
--- a/storage/innobase/include/fil0fil.ic
+++ b/storage/innobase/include/fil0fil.ic
@@ -69,7 +69,7 @@ fil_get_page_type_name(
case FIL_PAGE_TYPE_ZBLOB2:
return "ZBLOB2";
case FIL_PAGE_TYPE_UNKNOWN:
- return "OLD UNKOWN PAGE TYPE";
+ return "OLD UNKNOWN PAGE TYPE";
default:
return "PAGE TYPE CORRUPTED";
}
diff --git a/storage/innobase/row/row0sel.cc b/storage/innobase/row/row0sel.cc
index f3a17302864..5e78885a720 100644
--- a/storage/innobase/row/row0sel.cc
+++ b/storage/innobase/row/row0sel.cc
@@ -4272,7 +4272,7 @@ row_search_mvcc(
|| prebuilt->m_read_virtual_key);
/* Reset the new record lock info if srv_locks_unsafe_for_binlog
- is set or session is using a READ COMMITED isolation level. Then
+ is set or session is using a READ COMMITTED isolation level. Then
we are able to remove the record locks set here on an individual
row. */
prebuilt->new_rec_locks = 0;
@@ -4979,7 +4979,7 @@ wrong_offs:
existence with LOCK_REC_NOT_GAP. */
/* If innodb_locks_unsafe_for_binlog option is used
- or this session is using a READ COMMITED isolation
+ or this session is using a READ COMMITTED isolation
level we lock only the record, i.e., next-key locking is
not used. */
diff --git a/storage/innobase/srv/srv0mon.cc b/storage/innobase/srv/srv0mon.cc
index b56ffe99624..0404335574a 100644
--- a/storage/innobase/srv/srv0mon.cc
+++ b/storage/innobase/srv/srv0mon.cc
@@ -423,7 +423,7 @@ static monitor_info_t innodb_counter_info[] =
MONITOR_DEFAULT_START, MONITOR_FLUSH_AVG_TIME},
{"buffer_flush_adaptive_avg_pass", "buffer",
- "Numner of adaptive flushes passed during the recent Avg period.",
+ "Number of adaptive flushes passed during the recent Avg period.",
MONITOR_NONE,
MONITOR_DEFAULT_START, MONITOR_FLUSH_ADAPTIVE_AVG_PASS},
diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc
index 71456666fbe..1745e1fa653 100644
--- a/storage/maria/ha_maria.cc
+++ b/storage/maria/ha_maria.cc
@@ -1157,7 +1157,7 @@ int ha_maria::open(const char *name, int mode, uint test_if_locked)
/*
For static size rows, tell MariaDB that we will access all bytes
- in the record when writing it. This signals MariaDB to initalize
+ in the record when writing it. This signals MariaDB to initialize
the full row to ensure we don't get any errors from valgrind and
that all bytes in the row is properly reset.
*/
diff --git a/storage/maria/ma_close.c b/storage/maria/ma_close.c
index 44f65230c5d..2716f3b5c42 100644
--- a/storage/maria/ma_close.c
+++ b/storage/maria/ma_close.c
@@ -37,7 +37,7 @@ int maria_close(register MARIA_HA *info)
/* Check that we have unlocked key delete-links properly */
DBUG_ASSERT(info->key_del_used == 0);
- /* Check that file is not part of any uncommited transactions */
+ /* Check that file is not part of any uncommitted transactions */
DBUG_ASSERT(info->trn == 0 || info->trn == &dummy_transaction_object);
if (share->reopen == 1)
diff --git a/storage/maria/trnman.c b/storage/maria/trnman.c
index 744ca86412e..85a87e928b9 100644
--- a/storage/maria/trnman.c
+++ b/storage/maria/trnman.c
@@ -307,7 +307,7 @@ TRN *trnman_new_trn(WT_THD *wt)
if (!(trn= tmp.trn))
{
/*
- trn should be completely initalized at create time to allow
+ trn should be completely initialized at create time to allow
one to keep a known state on it.
(Like redo_lns, which is assumed to be 0 at start of row handling
and reset to zero before end of row handling)
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc
index 9b4dff68683..fd2e8fd9425 100644
--- a/storage/myisam/ha_myisam.cc
+++ b/storage/myisam/ha_myisam.cc
@@ -859,7 +859,7 @@ int ha_myisam::open(const char *name, int mode, uint test_if_locked)
/*
For static size rows, tell MariaDB that we will access all bytes
- in the record when writing it. This signals MariaDB to initalize
+ in the record when writing it. This signals MariaDB to initialize
the full row to ensure we don't get any errors from valgrind and
that all bytes in the row is properly reset.
*/
diff --git a/storage/perfschema/pfs_timer.h b/storage/perfschema/pfs_timer.h
index a4f55c20994..4a73e2b66ee 100644
--- a/storage/perfschema/pfs_timer.h
+++ b/storage/perfschema/pfs_timer.h
@@ -100,7 +100,7 @@ extern enum_timer_name stage_timer;
extern enum_timer_name statement_timer;
/**
Timer information data.
- Characteristics about each suported timer.
+ Characteristics about each supported timer.
*/
extern MYSQL_PLUGIN_IMPORT MY_TIMER_INFO sys_timer_info;
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/lock_rows_not_exist.test b/storage/rocksdb/mysql-test/rocksdb/t/lock_rows_not_exist.test
index d8a6bde45c8..a51a516aaaa 100644
--- a/storage/rocksdb/mysql-test/rocksdb/t/lock_rows_not_exist.test
+++ b/storage/rocksdb/mysql-test/rocksdb/t/lock_rows_not_exist.test
@@ -57,7 +57,7 @@ DELETE FROM t WHERE id1=1 AND id2=1 AND id3=0;
--disable_parsing
#
# The following is commented out because RocksDB's Transaction API doesn't
-# "support" READ COMMITED, in particular, it doesn't release row locks
+# "support" READ COMMITTED, in particular, it doesn't release row locks
# after each statement. (MyRocks is able to request a new snapshot for
# every statement, but this won't free the locks. TODO: Is the behavior
# that is tested below really needed?)
diff --git a/storage/sphinx/ha_sphinx.cc b/storage/sphinx/ha_sphinx.cc
index 812b362e737..4092cfcb514 100644
--- a/storage/sphinx/ha_sphinx.cc
+++ b/storage/sphinx/ha_sphinx.cc
@@ -3351,7 +3351,7 @@ int ha_sphinx::delete_table ( const char * )
// Renames a table from one name to another from alter table call.
//
// If you do not implement this, the default rename_table() is called from
-// handler.cc and it will delete all files with the file extentions returned
+// handler.cc and it will delete all files with the file extensions returned
// by bas_ext().
//
// Called from sql_table.cc by mysql_rename_table().
diff --git a/storage/tokudb/PerconaFT/ft/loader/loader.cc b/storage/tokudb/PerconaFT/ft/loader/loader.cc
index 5f57b473bc5..3ff237f05c7 100644
--- a/storage/tokudb/PerconaFT/ft/loader/loader.cc
+++ b/storage/tokudb/PerconaFT/ft/loader/loader.cc
@@ -1350,7 +1350,7 @@ int merge_row_arrays_base (struct row dest[/*an+bn*/], struct row a[/*an*/], int
* Arguments:
* dest write the rows here
* a,b the rows being merged
- * an,bn the lenth of a and b respectively.
+ * an,bn the length of a and b respectively.
* dest_db We need the dest_db to run the comparison function.
* compare We need the compare function for the dest_db.
*/
@@ -1449,7 +1449,7 @@ static int merge_row_arrays (struct row dest[/*an+bn*/], struct row a[/*an*/], i
* Arguments:
* dest write the rows here
* a,b the rows being merged
- * an,bn the lenth of a and b respectively.
+ * an,bn the length of a and b respectively.
* dest_db We need the dest_db to run the comparison function.
* compare We need the compare function for the dest_db.
*/
diff --git a/storage/tokudb/mysql-test/tokudb/t/type_bit.test b/storage/tokudb/mysql-test/tokudb/t/type_bit.test
index 445f69e8972..034585169f5 100644
--- a/storage/tokudb/mysql-test/tokudb/t/type_bit.test
+++ b/storage/tokudb/mysql-test/tokudb/t/type_bit.test
@@ -268,7 +268,7 @@ select hex(a), b from t1;
drop table t1;
#
-# type was not properly initalized, which caused key_copy to fail
+# type was not properly initialized, which caused key_copy to fail
#
create table t1(bit_field bit(2), int_field int, key a(bit_field));
View Lorry Controller Status