summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-05-13 11:53:30 +0200
committerSergei Golubchik <sergii@pisem.net>2014-05-13 11:53:30 +0200
commitedf1fbd25b81ecb0d5636566b35fa2f7fb09b0b8 (patch)
treece67377af1b49c3b3f0fc093b7a12000e9d5744d /storage
parent1170a54060168d885cbf682836342d4fc4ccae1a (diff)
downloadmariadb-git-edf1fbd25b81ecb0d5636566b35fa2f7fb09b0b8.tar.gz
MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wrong executable bits
Diffstat (limited to 'storage')
-rw-r--r--storage/connect/filamap.cpp2
-rw-r--r--storage/connect/filamfix.cpp6
-rw-r--r--storage/connect/filamtxt.cpp2
-rwxr-xr-xstorage/connect/filamvct.cpp10
-rw-r--r--storage/maria/ma_rnext.c2
-rw-r--r--storage/myisam/mi_rnext.c2
-rw-r--r--storage/perfschema/pfs_digest.cc2
7 files changed, 13 insertions, 13 deletions
diff --git a/storage/connect/filamap.cpp b/storage/connect/filamap.cpp
index f8a4e7d2f2b..1723ee4ac27 100644
--- a/storage/connect/filamap.cpp
+++ b/storage/connect/filamap.cpp
@@ -382,7 +382,7 @@ int MAPFAM::DeleteRecords(PGLOBAL g, int irc)
if (Tpos == Spos)
/*******************************************************************/
- /* First line to delete. Move of eventual preceeding lines is */
+ /* First line to delete. Move of eventual preceding lines is */
/* not required here, just setting of future Spos and Tpos. */
/*******************************************************************/
Tpos = Fpos; // Spos is set below
diff --git a/storage/connect/filamfix.cpp b/storage/connect/filamfix.cpp
index a64d7bdc04d..9338ae322db 100644
--- a/storage/connect/filamfix.cpp
+++ b/storage/connect/filamfix.cpp
@@ -367,7 +367,7 @@ int FIXFAM::DeleteRecords(PGLOBAL g, int irc)
} else {
/*****************************************************************/
- /* Move of eventual preceeding lines is not required here. */
+ /* Move of eventual preceding lines is not required here. */
/* Set the target file as being the source file itself. */
/* Set the future Tpos, and give Spos a value to block moving. */
/*****************************************************************/
@@ -1165,7 +1165,7 @@ int BGXFAM::DeleteRecords(PGLOBAL g, int irc)
if (Tpos == Spos) {
/*******************************************************************/
- /* First line to delete. Move of eventual preceeding lines is */
+ /* First line to delete. Move of eventual preceding lines is */
/* not required here if a temporary file is not used, just the */
/* setting of future Spos and Tpos. */
/*******************************************************************/
@@ -1178,7 +1178,7 @@ int BGXFAM::DeleteRecords(PGLOBAL g, int irc)
} else {
/*****************************************************************/
- /* Move of eventual preceeding lines is not required here. */
+ /* Move of eventual preceding lines is not required here. */
/* Set the target file as being the source file itself. */
/* Set the future Tpos, and give Spos a value to block copying. */
/*****************************************************************/
diff --git a/storage/connect/filamtxt.cpp b/storage/connect/filamtxt.cpp
index ecd255afd2e..e4e9130dc86 100644
--- a/storage/connect/filamtxt.cpp
+++ b/storage/connect/filamtxt.cpp
@@ -714,7 +714,7 @@ int DOSFAM::DeleteRecords(PGLOBAL g, int irc)
} else {
/*****************************************************************/
- /* Move of eventual preceeding lines is not required here. */
+ /* Move of eventual preceding lines is not required here. */
/* Set the target file as being the source file itself. */
/* Set the future Tpos, and give Spos a value to block copying. */
/*****************************************************************/
diff --git a/storage/connect/filamvct.cpp b/storage/connect/filamvct.cpp
index 97eb4c7c8b4..1957c7f29ac 100755
--- a/storage/connect/filamvct.cpp
+++ b/storage/connect/filamvct.cpp
@@ -712,7 +712,7 @@ int VCTFAM::DeleteRecords(PGLOBAL g, int irc)
} else {
/*****************************************************************/
- /* First line to delete. Move of eventual preceeding lines is */
+ /* First line to delete. Move of eventual preceding lines is */
/* not required here, just the setting of future Spos and Tpos. */
/*****************************************************************/
T_Stream = Stream;
@@ -1558,7 +1558,7 @@ int VCMFAM::DeleteRecords(PGLOBAL g, int irc)
if (Tpos == Spos)
/*******************************************************************/
- /* First line to delete. Move of eventual preceeding lines is */
+ /* First line to delete. Move of eventual preceding lines is */
/* not required here, just setting of future Spos and Tpos. */
/*******************************************************************/
Tpos = Fpos; // Spos is set below
@@ -2153,7 +2153,7 @@ int VECFAM::DeleteRecords(PGLOBAL g, int irc)
} else
/*****************************************************************/
- /* Move of eventual preceeding lines is not required here. */
+ /* Move of eventual preceding lines is not required here. */
/* Set the future Tpos, and give Spos a value to block copying. */
/*****************************************************************/
Spos = Tpos = Fpos;
@@ -2834,7 +2834,7 @@ int VMPFAM::DeleteRecords(PGLOBAL g, int irc)
if (Tpos == Spos)
/*******************************************************************/
- /* First line to delete. Move of eventual preceeding lines is */
+ /* First line to delete. Move of eventual preceding lines is */
/* not required here, just setting of future Spos and Tpos. */
/*******************************************************************/
Tpos = Fpos; // Spos is set below
@@ -3756,7 +3756,7 @@ int BGVFAM::DeleteRecords(PGLOBAL g, int irc)
} else {
/*****************************************************************/
- /* Move of eventual preceeding lines is not required here. */
+ /* Move of eventual preceding lines is not required here. */
/* Set the target file as being the source file itself. */
/* Set the future Tpos, and give Spos a value to block copying. */
/*****************************************************************/
diff --git a/storage/maria/ma_rnext.c b/storage/maria/ma_rnext.c
index d3fab041d75..b4c1692d77d 100644
--- a/storage/maria/ma_rnext.c
+++ b/storage/maria/ma_rnext.c
@@ -71,7 +71,7 @@ int maria_rnext(MARIA_HA *info, uchar *buf, int inx)
Normally SQL layer would never request "search next" if
"search first" failed. But HANDLER may do anything.
- As mi_rnext() without preceeding mi_rkey()/mi_rfirst()
+ As mi_rnext() without preceding mi_rkey()/mi_rfirst()
equals to mi_rfirst(), we must restore original state
as if failing mi_rfirst() was not called.
*/
diff --git a/storage/myisam/mi_rnext.c b/storage/myisam/mi_rnext.c
index ee5c74f8da1..509cd75fbab 100644
--- a/storage/myisam/mi_rnext.c
+++ b/storage/myisam/mi_rnext.c
@@ -66,7 +66,7 @@ int mi_rnext(MI_INFO *info, uchar *buf, int inx)
Normally SQL layer would never request "search next" if
"search first" failed. But HANDLER may do anything.
- As mi_rnext() without preceeding mi_rkey()/mi_rfirst()
+ As mi_rnext() without preceding mi_rkey()/mi_rfirst()
equals to mi_rfirst(), we must restore original state
as if failing mi_rfirst() was not called.
*/
diff --git a/storage/perfschema/pfs_digest.cc b/storage/perfschema/pfs_digest.cc
index 5db626314a2..58eae435ca9 100644
--- a/storage/perfschema/pfs_digest.cc
+++ b/storage/perfschema/pfs_digest.cc
@@ -47,7 +47,7 @@
/**
Token array :
- Token array is an array of bytes to store tokens recieved during parsing.
+ Token array is an array of bytes to store tokens received during parsing.
Following is the way token array is formed.
...<non-id-token><non-id-token><id-token><id_len><id_text>...