Skip to content

Commit 6665659

Browse files
committed
Fix most typos that lintianspell found
Before this change `lintianspell` reported: ± find * -type f | xargs spellintian BUILD/FINISH.sh: fi fi (duplicate word) -> fi BUILD/compile-pentium32-gcov: fi fi (duplicate word) -> fi BUILD/compile-dist: fi fi (duplicate word) -> fi BUILD/SETUP.sh: fi fi (duplicate word) -> fi BUILD/compile-solaris-sparc-purify: mysqld mysqld (duplicate word) -> mysqld BUILD-CMAKE: remebered -> remembered BUILD-CMAKE: "allows to" -> "allows one to" BUILD-CMAKE: "Let's you" -> "Lets you" client/mysqlbinlog.cc: they they (duplicate word) -> they client/mysqldump.c: query query (duplicate word) -> query client/mysqldump.c: name name (duplicate word) -> name client/mysqldump.c: flags flags (duplicate word) -> flags client/mysqldump.c: "allows to" -> "allows one to" client/mysqladmin.cc: wait wait (duplicate word) -> wait client/mysql_plugin.c: the the (duplicate word) -> the client/mysql.cc: comand -> command client/mysql.cc: mysql mysql (duplicate word) -> mysql client/mysql.cc: type type (duplicate word) -> type client/mysql.cc: prompt prompt (duplicate word) -> prompt client/mysql.cc: struct struct (duplicate word) -> struct client/mysqlslap.c: long long (duplicate word) -> long client/mysqlcheck.c: to to (duplicate word) -> to client/mysqltest.cc: long long (duplicate word) -> long client/mysqltest.cc: string string (duplicate word) -> string client/mysqltest.cc: the the (duplicate word) -> the client/mysqltest.cc: mysql mysql (duplicate word) -> mysql client/mysqltest.cc: flags flags (duplicate word) -> flags client/mysqltest.cc: query query (duplicate word) -> query client/mysqltest.cc: if if (duplicate word) -> if client/mysqltest.cc: not not (duplicate word) -> not cmake/ssl.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/mysql_version.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/aws_sdk.cmake: librairies -> libraries cmake/aws_sdk.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/submodules.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/install_macros.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/compile_flags.cmake: ENDFOREACH ENDFOREACH (duplicate word) -> ENDFOREACH cmake/dtrace.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/dtrace_prelink.cmake: ENDFOREACH ENDFOREACH (duplicate word) -> ENDFOREACH cmake/mariadb_connector_c.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/check_compiler_flag.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/zlib.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/versioninfo.rc.in: END END (duplicate word) -> END cmake/build_configurations/mysql_release.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/libutils.cmake: not not (duplicate word) -> not cmake/libutils.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/os/HP-UX.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/os/Windows.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/os/Windows.cmake: ENDFOREACH ENDFOREACH (duplicate word) -> ENDFOREACH cmake/os/Windows.cmake: "Allow to" -> "Allow one to" cmake/os/SunOS.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/numa.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/Internal/CPack/CPackRPM.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/readline.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/cpack_rpm.cmake: build build (duplicate word) -> build cmake/cpack_rpm.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/systemd.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/install_layout.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/plugin.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/for_clients.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/mysql_add_executable.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/make_dist.cmake.in: ENDIF ENDIF (duplicate word) -> ENDIF cmake/pcre.cmake: libary -> library cmake/pcre.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/create_initial_db.cmake: ENDFOREACH ENDFOREACH (duplicate word) -> ENDFOREACH cmake/cpu_info.cmake: ENDIF ENDIF (duplicate word) -> ENDIF cmake/package_name.cmake: ENDIF ENDIF (duplicate word) -> ENDIF CMakeLists.txt: hapen -> happen CMakeLists.txt: ENDIF ENDIF (duplicate word) -> ENDIF CMakeLists.txt: ENDFOREACH ENDFOREACH (duplicate word) -> ENDFOREACH configure.cmake: ENDIF ENDIF (duplicate word) -> ENDIF configure.cmake: funcion -> function dbug/dbug.c: frp frp (duplicate word) -> frp dbug/dbug.c: to to (duplicate word) -> to debian/salsa-ci.yml: mysql mysql (duplicate word) -> mysql debian/mariadb-server-10.6.preinst: fi fi (duplicate word) -> fi debian/mariadb-server-10.6.mariadb.init: fi fi (duplicate word) -> fi debian/po/ca.po: diferent -> different debian/mariadb-server-10.6.postinst: fi fi (duplicate word) -> fi debian/mariadb-server-10.6.templates: mysql mysql (duplicate word) -> mysql debian/mariadb-server-10.6.postrm: fi fi (duplicate word) -> fi debian/autobake-deb.sh: enviroment -> environment debian/additions/innotop/innotop.1: ae ae (duplicate word) -> ae debian/additions/innotop/innotop.1: Pages Pages (duplicate word) -> Pages debian/mariadb-common.postinst: fi fi (duplicate word) -> fi Docs/INSTALL-BINARY: mysql mysql (duplicate word) -> mysql extra/wolfssl/CMakeLists.txt: ENDIF ENDIF (duplicate word) -> ENDIF extra/wolfssl/CMakeLists.txt: endif endif (duplicate word) -> endif extra/perror.c: unknow -> unknown extra/innochecksum.cc: long long (duplicate word) -> long extra/innochecksum.cc: error error (duplicate word) -> error extra/innochecksum.cc: page page (duplicate word) -> page extra/innochecksum.cc: file file (duplicate word) -> file extra/mariabackup/backup_mysql.cc: long long (duplicate word) -> long extra/mariabackup/backup_copy.cc: "allows to" -> "allows one to" extra/mariabackup/xbcloud.cc: verison -> version extra/mariabackup/xbcloud.cc: recieved -> received extra/mariabackup/CMakeLists.txt: ENDIF ENDIF (duplicate word) -> ENDIF extra/mariabackup/xtrabackup.h: delimiters delimiters (duplicate word) -> delimiters extra/mariabackup/fil_cur.cc: tablepsaces -> tablespaces extra/mariabackup/fil_cur.h: tablepsaces -> tablespaces extra/mariabackup/xtrabackup.cc: neccessary -> necessary extra/mariabackup/xtrabackup.cc: delimiters delimiters (duplicate word) -> delimiters extra/mariabackup/xtrabackup.cc: loggin -> login extra/mariabackup/xtrabackup.cc: possiblity -> possibility extra/mariabackup/xtrabackup.cc: suffix suffix (duplicate word) -> suffix extra/mariabackup/wsrep.cc: long long (duplicate word) -> long extra/aws_sdk/CMakeLists.txt: "Allow to" -> "Allow one to" extra/replace.c: convinience -> convenience extra/readline/histlib.h: n n (duplicate word) -> n extra/readline/parens.c: delimiter delimiter (duplicate word) -> delimiter extra/readline/vi_mode.c: wc wc (duplicate word) -> wc extra/readline/display.c: e e (duplicate word) -> e extra/readline/display.c: v v (duplicate word) -> v extra/readline/display.c: postion -> position extra/readline/rldefs.h: n n (duplicate word) -> n extra/readline/history.c: carefull -> careful extra/readline/text.c: pased -> passed extra/readline/configure.in: dnl dnl (duplicate word) -> dnl extra/readline/configure.in: fi fi (duplicate word) -> fi extra/readline/readline.c: Initalize -> Initialize extra/readline/histexpand.c: upto -> up to extra/readline/histexpand.c: modfiers -> modifiers extra/CMakeLists.txt: ENDIF ENDIF (duplicate word) -> ENDIF include/mysql/plugin_audit.h.pp: long long (duplicate word) -> long include/mysql/service_encryption_scheme.h: long long (duplicate word) -> long include/mysql/plugin.h: long long (duplicate word) -> long include/mysql/plugin.h: prefix prefix (duplicate word) -> prefix include/mysql/psi/psi_base.h: "Allow to" -> "Allow one to" include/mysql/psi/psi.h: must must (duplicate word) -> must include/mysql/psi/psi.h: length length (duplicate word) -> length include/mysql/psi/psi.h: "Allow to" -> "Allow one to" include/mysql/service_progress_report.h: long long (duplicate word) -> long include/mysql/plugin_audit.h: long long (duplicate word) -> long include/mysql/plugin_auth.h.pp: long long (duplicate word) -> long include/mysql/auth_dialog_client.h: mysql mysql (duplicate word) -> mysql include/mysql/auth_dialog_client.h: type type (duplicate word) -> type include/mysql/auth_dialog_client.h: prompt prompt (duplicate word) -> prompt include/mysql/plugin_password_validation.h.pp: long long (duplicate word) -> long include/mysql/plugin_encryption.h.pp: long long (duplicate word) -> long include/mysql/plugin_data_type.h.pp: long long (duplicate word) -> long include/mysql/service_logger.h: long long (duplicate word) -> long include/mysql/client_plugin.h: type type (duplicate word) -> type include/mysql/client_plugin.h: value value (duplicate word) -> value include/mysql/service_wsrep.h: long long (duplicate word) -> long include/mysql/plugin_ftparser.h.pp: long long (duplicate word) -> long include/mysql/plugin_function.h.pp: long long (duplicate word) -> long include/my_global.h: long long (duplicate word) -> long include/json_lib.h: lenght -> length include/my_sys.h: long long (duplicate word) -> long include/mysql.h: long long (duplicate word) -> long include/myisam.h: dupplicated -> duplicated include/my_base.h: dupplicated -> duplicated include/big_endian.h: short short (duplicate word) -> short include/ma_dyncol.h: long long (duplicate word) -> long spellintian: can't decode ill-formed UTF-8 octet sequence <FF> in position 0 at /usr/share/perl5/Path/Tiny.pm line 2087. xargs: spellintian: exited with status 255; aborting Fix all clear and easy to fix typos that have no functional effect, and thus should be perfectly safe to do on the 10.6 branch. This is intentionally done in a separate step from other typofixes for easier patch management between upstream and downstream (Debian) MariaDB.
1 parent b01eef6 commit 6665659

18 files changed

Lines changed: 21 additions & 21 deletions

BUILD-CMAKE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ CONFIGURATION PARAMETERS
105105
---------------------------------------------------------------
106106
The procedure above will build with default configuration.
107107

108-
Let's you want to change the configuration parameters and have archive
108+
Lets you want to change the configuration parameters and have archive
109109
storage engine compiled into the server instead of building it as pluggable
110110
module.
111111

@@ -115,7 +115,7 @@ shell> cmake . -DWITH_ARCHIVE_STORAGE_ENGINE=1
115115

116116
This can be done during the initial configuration or any time later.
117117

118-
Note, that parameters are "sticky", that is they are remebered in the CMake
118+
Note, that parameters are "sticky", that is they are remembered in the CMake
119119
cache (CMakeCache.txt file in the build directory)
120120

121121
2) Configuration using cmake-gui (Windows, OSX, or Linux with cmake-gui

BUILD/SETUP.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ fi
280280
# (returns 0 if finds lines)
281281

282282
# As cmake doesn't like CC and CXX with a space, use symlinks from
283-
# /usr/lib64/ccache if they exits.
283+
# /usr/lib64/ccache if they exist.
284284

285285
if ccache -V > /dev/null 2>&1 && test "$CCACHE_DISABLE" != "1" && test "$CC" = "gcc"
286286
then

BUILD/compile-pentium32-gcov

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# along with this program; if not, write to the Free Software
1616
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
1717

18-
# Need to disable ccache, or we loose the gcov-needed compiler output files.
18+
# Need to disable ccache, or we lose the gcov-needed compiler output files.
1919

2020
USING_GCOV=1
2121
CCACHE_GCOV_VERSION_ENABLED=0

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ IF(UNIX AND NOT APPLE)
6363
# the empty CMAKE_BUILD_TYPE) and the build many times for
6464
# different build types without re-running cmake!
6565
# But we only care about WITH_PIC on Unix, where the check for
66-
# CMAKE_BUILD_TYPE hapen to work.
66+
# CMAKE_BUILD_TYPE happen to work.
6767
IF (CMAKE_BUILD_TYPE MATCHES "Debug")
6868
SET(WITH_PIC_DEFAULT ON)
6969
ELSE()

cmake/aws_sdk.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ FUNCTION (CHECK_AWS_SDK RETVAL REASON)
4343
ENDIF()
4444

4545
IF(UNIX)
46-
# Check librairies required for building SDK
46+
# Check libraries required for building SDK
4747
FIND_PACKAGE(CURL)
4848
SET_PACKAGE_PROPERTIES(CURL PROPERTIES TYPE REQUIRED)
4949
IF(NOT CURL_FOUND)

cmake/pcre.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ MACRO(BUNDLE_PCRE2)
3333
SET(file ${dir}/src/pcre2-build/${intdir}${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${PCRE_STATIC}${CMAKE_STATIC_LIBRARY_SUFFIX})
3434

3535
IF(WIN32)
36-
# Debug libary name.
36+
# Debug library name.
3737
# Same condition as in pcre2 CMakeLists.txt that adds "d"
3838
SET(file_d ${dir}/src/pcre2-build/${intdir}${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${PCRE_STATIC}d${CMAKE_STATIC_LIBRARY_SUFFIX})
3939
SET_TARGET_PROPERTIES(${lib} PROPERTIES IMPORTED_LOCATION_DEBUG ${file_d})

configure.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ IF(NOT C_HAS_inline)
731731
SET(C_INLINE __inline)
732732
ElSE()
733733
SET(C_INLINE)
734-
MESSAGE(WARNING "C compiler does not support funcion inlining")
734+
MESSAGE(WARNING "C compiler does not support function inlining")
735735
IF(NOT NOINLINE)
736736
MESSAGE(FATAL_ERROR "Use -DNOINLINE=TRUE to allow compilation without inlining")
737737
ENDIF()

debian/autobake-deb.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ fi
168168

169169
# If running autobake-debs.sh inside docker/podman host machine which
170170
# has 64 bits cpu but container image is 32 bit make sure that we set
171-
# correct arch with linux32 for 32 bit enviroment
171+
# correct arch with linux32 for 32 bit environment
172172
if [ "$architecture" = "i386" ] && [ "$uname_machine" = "x86_64" ]
173173
then
174174
BUILDPACKAGE_DPKGCMD+=("linux32")

extra/mariabackup/fil_cur.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ specified possibly absolute path.
4747
For user tablespaces both "./database/table.ibd" and
4848
"/remote/dir/database/table.ibd" result in "database/table.ibd".
4949
50-
For system tablepsaces (i.e. When is_system is TRUE) both "/remote/dir/ibdata1"
50+
For system tablespaces (i.e. When is_system is TRUE) both "/remote/dir/ibdata1"
5151
and "./ibdata1" yield "ibdata1" in the output. */
5252
const char *
5353
xb_get_relative_path(

extra/mariabackup/fil_cur.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ specified possibly absolute path.
116116
For user tablespaces both "./database/table.ibd" and
117117
"/remote/dir/database/table.ibd" result in "database/table.ibd".
118118
119-
For system tablepsaces (i.e. When is_system is TRUE) both "/remote/dir/ibdata1"
119+
For system tablespaces (i.e. When is_system is TRUE) both "/remote/dir/ibdata1"
120120
and "./ibdata1" yield "ibdata1" in the output. */
121121
const char *
122122
xb_get_relative_path(

0 commit comments

Comments
 (0)