summaryrefslogtreecommitdiff
path: root/storage/connect
diff options
context:
space:
mode:
authorOtto Kekäläinen <otto@kekalainen.net>2020-03-04 18:30:08 +0200
committerOtto Kekäläinen <otto@kekalainen.net>2020-03-16 00:10:50 +0200
commitc8388de2fd9d6132f5e74a2e7943a98fbdcf2c58 (patch)
treeafb45488d109e3baaa80c9e71b6e7ce7a737e205 /storage/connect
parent3c57693ff199b066c9cd5eef4f5a2ec6ca5b7898 (diff)
downloadmariadb-git-c8388de2fd9d6132f5e74a2e7943a98fbdcf2c58.tar.gz
Fix various spelling errors
e.g. - dont -> don't - occurence -> occurrence - succesfully -> successfully - easyly -> easily Also remove trailing space in selected files. These changes span: - server core - Connect and Innobase storage engine code - OQgraph, Sphinx and TokuDB storage engines Related to MDEV-21769.
Diffstat (limited to 'storage/connect')
-rw-r--r--storage/connect/plgdbutl.cpp6
-rw-r--r--storage/connect/taboccur.cpp4
-rw-r--r--storage/connect/taboccur.h8
-rw-r--r--storage/connect/tabpivot.cpp4
-rw-r--r--storage/connect/tabpivot.h2
-rw-r--r--storage/connect/tabutil.cpp2
-rw-r--r--storage/connect/tabxcl.cpp4
-rw-r--r--storage/connect/tabxcl.h2
8 files changed, 16 insertions, 16 deletions
diff --git a/storage/connect/plgdbutl.cpp b/storage/connect/plgdbutl.cpp
index 54808aa682f..c20c3d56c3f 100644
--- a/storage/connect/plgdbutl.cpp
+++ b/storage/connect/plgdbutl.cpp
@@ -428,7 +428,7 @@ char *ExtractFromPath(PGLOBAL g, char *pBuff, char *FileName, OPVAL op)
#ifdef NOT_USED
/***********************************************************************/
-/* Check the occurence and matching of a pattern against a string. */
+/* Check the occurrence and matching of a pattern against a string. */
/* Because this function is only used for catalog name checking, */
/* it must be case insensitive. */
/***********************************************************************/
@@ -572,7 +572,7 @@ bool EvalLikePattern(LPCSTR sp, LPCSTR tp)
b = (t || !*sp); /* true if % or void strg. */
else if (!t) {
/*******************************************************************/
- /* No character to skip, check occurence of <subtring-specifier> */
+ /* No character to skip, check occurrence of <subtring-specifier> */
/* at the very beginning of remaining string. */
/*******************************************************************/
if (p) {
@@ -586,7 +586,7 @@ bool EvalLikePattern(LPCSTR sp, LPCSTR tp)
if (p)
/*****************************************************************/
/* Here is the case explaining why we need a recursive routine. */
- /* The test must be done not only against the first occurence */
+ /* The test must be done not only against the first occurrence */
/* of the <substring-specifier> in the remaining string, */
/* but also with all eventual succeeding ones. */
/*****************************************************************/
diff --git a/storage/connect/taboccur.cpp b/storage/connect/taboccur.cpp
index 20d4c0cb032..8f5c4e0e732 100644
--- a/storage/connect/taboccur.cpp
+++ b/storage/connect/taboccur.cpp
@@ -292,7 +292,7 @@ TDBOCCUR::TDBOCCUR(POCCURDEF tdp) : TDBPRX(tdp)
Col = NULL; // To source column blocks array
Mult = PrepareColist(Colist); // Multiplication factor
N = 0; // The current table index
- M = 0; // The occurence rank
+ M = 0; // The occurrence rank
RowFlag = 0; // 0: Ok, 1: Same, 2: Skip
} // end of TDBOCCUR constructor
@@ -431,7 +431,7 @@ int TDBOCCUR::GetMaxSize(PGLOBAL g)
/***********************************************************************/
/* In this sample, ROWID will be the (virtual) row number, */
-/* while ROWNUM will be the occurence rank in the multiple column. */
+/* while ROWNUM will be the occurrence rank in the multiple column. */
/***********************************************************************/
int TDBOCCUR::RowNumber(PGLOBAL, bool b)
{
diff --git a/storage/connect/taboccur.h b/storage/connect/taboccur.h
index 4538d3d71f2..13bc055cd6f 100644
--- a/storage/connect/taboccur.h
+++ b/storage/connect/taboccur.h
@@ -35,7 +35,7 @@ class OCCURDEF : public PRXDEF { /* Logical table description */
protected:
// Members
char *Colist; /* The source column list */
- char *Xcol; /* The multiple occurence column */
+ char *Xcol; /* The multiple occurrence column */
char *Rcol; /* The rank column */
}; // end of OCCURDEF
@@ -76,12 +76,12 @@ class TDBOCCUR : public TDBPRX {
PCOL *Col; // To source multiple columns
int Mult; // Multiplication factor
int N; // The current table index
- int M; // The occurence rank
+ int M; // The occurrence rank
BYTE RowFlag; // 0: Ok, 1: Same, 2: Skip
}; // end of class TDBOCCUR
/***********************************************************************/
-/* Class OCCURCOL: for the multiple occurence column. */
+/* Class OCCURCOL: for the multiple occurrence column. */
/***********************************************************************/
class OCCURCOL : public COLBLK {
public:
@@ -106,7 +106,7 @@ class OCCURCOL : public COLBLK {
}; // end of class OCCURCOL
/***********************************************************************/
-/* Class RANKCOL: for the multiple occurence column ranking. */
+/* Class RANKCOL: for the multiple occurrence column ranking. */
/***********************************************************************/
class RANKCOL : public COLBLK {
public:
diff --git a/storage/connect/tabpivot.cpp b/storage/connect/tabpivot.cpp
index 1ba36864005..25fe798f2ac 100644
--- a/storage/connect/tabpivot.cpp
+++ b/storage/connect/tabpivot.cpp
@@ -404,7 +404,7 @@ TDBPIVOT::TDBPIVOT(PPIVOTDEF tdp) : TDBPRX(tdp)
Accept = tdp->Accept;
Mult = -1; // Estimated table size
N = 0; // The current table index
- M = 0; // The occurence rank
+ M = 0; // The occurrence rank
FileStatus = 0; // Logical End-of-File
RowFlag = 0; // 0: Ok, 1: Same, 2: Skip
} // end of TDBPIVOT constructor
@@ -644,7 +644,7 @@ int TDBPIVOT::GetMaxSize(PGLOBAL g __attribute__((unused)))
/***********************************************************************/
/* In this sample, ROWID will be the (virtual) row number, */
-/* while ROWNUM will be the occurence rank in the multiple column. */
+/* while ROWNUM will be the occurrence rank in the multiple column. */
/***********************************************************************/
int TDBPIVOT::RowNumber(PGLOBAL, bool b)
{
diff --git a/storage/connect/tabpivot.h b/storage/connect/tabpivot.h
index 6c2d53e9527..d819d55a61a 100644
--- a/storage/connect/tabpivot.h
+++ b/storage/connect/tabpivot.h
@@ -138,7 +138,7 @@ class TDBPIVOT : public TDBPRX {
int Mult; // Multiplication factor
int Ncol; // The number of generated columns
int N; // The current table index
- int M; // The occurence rank
+ int M; // The occurrence rank
int Port; // MySQL port number
BYTE FileStatus; // 0: First 1: Rows 2: End-of-File
BYTE RowFlag; // 0: Ok, 1: Same, 2: Skip
diff --git a/storage/connect/tabutil.cpp b/storage/connect/tabutil.cpp
index 8113ee620c3..65361acfcd8 100644
--- a/storage/connect/tabutil.cpp
+++ b/storage/connect/tabutil.cpp
@@ -536,7 +536,7 @@ int TDBPRX::GetMaxSize(PGLOBAL g)
/***********************************************************************/
/* In this sample, ROWID will be the (virtual) row number, */
-/* while ROWNUM will be the occurence rank in the multiple column. */
+/* while ROWNUM will be the occurrence rank in the multiple column. */
/***********************************************************************/
int TDBPRX::RowNumber(PGLOBAL g, bool b)
{
diff --git a/storage/connect/tabxcl.cpp b/storage/connect/tabxcl.cpp
index 4634f6a4ded..46620985852 100644
--- a/storage/connect/tabxcl.cpp
+++ b/storage/connect/tabxcl.cpp
@@ -103,7 +103,7 @@ TDBXCL::TDBXCL(PXCLDEF tdp) : TDBPRX(tdp)
Xcolp = NULL; // To the XCLCOL column
Mult = tdp->Mult; // Multiplication factor
N = 0; // The current table index
- M = 0; // The occurence rank
+ M = 0; // The occurrence rank
RowFlag = 0; // 0: Ok, 1: Same, 2: Skip
New = TRUE; // TRUE for new line
Sep = tdp->Sep; // The Xcol separator
@@ -142,7 +142,7 @@ int TDBXCL::GetMaxSize(PGLOBAL g)
/***********************************************************************/
/* For this table type, ROWID is the (virtual) row number, */
-/* while ROWNUM is be the occurence rank in the multiple column. */
+/* while ROWNUM is be the occurrence rank in the multiple column. */
/***********************************************************************/
int TDBXCL::RowNumber(PGLOBAL, bool b)
{
diff --git a/storage/connect/tabxcl.h b/storage/connect/tabxcl.h
index fde000ee709..2ae96703548 100644
--- a/storage/connect/tabxcl.h
+++ b/storage/connect/tabxcl.h
@@ -72,7 +72,7 @@ class TDBXCL : public TDBPRX {
PXCLCOL Xcolp; // To the XCVCOL column
int Mult; // Multiplication factor
int N; // The current table index
- int M; // The occurence rank
+ int M; // The occurrence rank
BYTE RowFlag; // 0: Ok, 1: Same, 2: Skip
bool New; // TRUE for new line
char Sep; // The Xcol separator