summaryrefslogtreecommitdiff
path: root/storage/connect
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2023-01-04 14:52:25 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2023-01-04 14:52:25 +0200
commit8356fb68c366b7f515f9060d964ee598653756a6 (patch)
tree310d7419ad32f74ad29b3da87dd1a21ab4d39dd7 /storage/connect
parentb5a54e8a9305885e2850d6dabde08ad369094ff3 (diff)
parentfe38d7cad4fab33beba90eefaea9e9d4aef06a7c (diff)
downloadmariadb-git-8356fb68c366b7f515f9060d964ee598653756a6.tar.gz
Merge 10.6 into 10.7
Diffstat (limited to 'storage/connect')
-rw-r--r--storage/connect/value.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/connect/value.cpp b/storage/connect/value.cpp
index 9586f834b8f..498ec71a87f 100644
--- a/storage/connect/value.cpp
+++ b/storage/connect/value.cpp
@@ -1199,7 +1199,7 @@ bool TYPVAL<TYPE>::Compall(PGLOBAL g, PVAL *vp, int np, OPVAL op)
/***********************************************************************/
/* FormatValue: This function set vp (a STRING value) to the string */
-/* constructed from its own value formated using the fmt format. */
+/* constructed from its own value formatted using the fmt format. */
/* This function assumes that the format matches the value type. */
/***********************************************************************/
template <class TYPE>
@@ -1711,7 +1711,7 @@ bool TYPVAL<PSZ>::Compute(PGLOBAL g, PVAL *vp, int np, OPVAL op)
/***********************************************************************/
/* FormatValue: This function set vp (a STRING value) to the string */
-/* constructed from its own value formated using the fmt format. */
+/* constructed from its own value formatted using the fmt format. */
/* This function assumes that the format matches the value type. */
/***********************************************************************/
bool TYPVAL<PSZ>::FormatValue(PVAL vp, PCSZ fmt)
@@ -2325,7 +2325,7 @@ bool BINVAL::IsEqual(PVAL vp, bool chktype)
/***********************************************************************/
/* FormatValue: This function set vp (a STRING value) to the string */
-/* constructed from its own value formated using the fmt format. */
+/* constructed from its own value formatted using the fmt format. */
/* This function assumes that the format matches the value type. */
/***********************************************************************/
bool BINVAL::FormatValue(PVAL vp, PCSZ fmt)
@@ -2865,7 +2865,7 @@ bool DTVAL::WeekNum(PGLOBAL g, int& nval)
/***********************************************************************/
/* FormatValue: This function set vp (a STRING value) to the string */
-/* constructed from its own value formated using the fmt format. */
+/* constructed from its own value formatted using the fmt format. */
/* This function assumes that the format matches the value type. */
/***********************************************************************/
bool DTVAL::FormatValue(PVAL vp, PCSZ fmt)