diff options
Diffstat (limited to 'debian/patches/fix-spelling-mariadb.patch')
-rw-r--r-- | debian/patches/fix-spelling-mariadb.patch | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/debian/patches/fix-spelling-mariadb.patch b/debian/patches/fix-spelling-mariadb.patch index 0eb88d3f..5d5265cb 100644 --- a/debian/patches/fix-spelling-mariadb.patch +++ b/debian/patches/fix-spelling-mariadb.patch @@ -14,3 +14,77 @@ Subject: [PATCH] Fix misc spelling in MariaDB Server repository cap = NULL; } catch (const char *msg) { htrc(g->Message, msg); +--- a/extra/mariabackup/innobackupex.cc ++++ b/extra/mariabackup/innobackupex.cc +@@ -188,7 +188,7 @@ enum innobackupex_options + OPT_DATABASES, + OPT_DECOMPRESS, + +- /* options wich are passed directly to xtrabackup */ ++ /* options which are passed directly to xtrabackup */ + OPT_CLOSE_FILES, + OPT_COMPACT, + OPT_COMPRESS, +@@ -447,7 +447,7 @@ static struct my_option ibx_long_options + {"startup-wait-timeout", OPT_LOCK_WAIT_TIMEOUT, + "This option specifies time in seconds that mariadb-backup should wait for " + "BACKUP STAGE START to complete. BACKUP STAGE START has to wait until all " +- "currently running queries using explicite LOCK TABLES has ended. " ++ "currently running queries using explicit LOCK TABLES has ended. " + "If there are still such queries when the timeout expires, mariadb-backup " + "terminates with an error. Default is 0, in which case mariadb-backup waits " + "indefinitely for BACKUP STAGE START to finish", +--- a/extra/mariabackup/xtrabackup.cc ++++ b/extra/mariabackup/xtrabackup.cc +@@ -217,7 +217,7 @@ uint xtrabackup_compress = FALSE; + uint xtrabackup_compress_threads; + ulonglong xtrabackup_compress_chunk_size = 0; + +-/* sleep interval beetween log copy iterations in log copying thread ++/* sleep interval between log copy iterations in log copying thread + in milliseconds (default is 1 second) */ + ulint xtrabackup_log_copy_interval = 1000; + static ulong max_buf_pool_modified_pct; +@@ -1597,11 +1597,11 @@ struct my_option xb_client_options[]= { + GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, + + {"rsync", OPT_RSYNC, +- "Obsolete depricated option", ++ "Obsolete deprecated option", + &ignored_option, &ignored_option, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, + + {"no-backup-locks", OPT_NO_BACKUP_LOCKS, +- "Obsolete depricated option", ++ "Obsolete deprecated option", + &ignored_option, &ignored_option, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, + + {"force-non-empty-directories", OPT_FORCE_NON_EMPTY_DIRS, +@@ -1729,7 +1729,7 @@ struct my_option xb_client_options[]= { + {"startup-wait-timeout", OPT_LOCK_WAIT_TIMEOUT, + "This option specifies time in seconds that mariadb-backup should wait for " + "BACKUP STAGE START to complete. BACKUP STAGE START has to wait until all " +- "currently running queries using explicite LOCK TABLES has ended. " ++ "currently running queries using explicit LOCK TABLES has ended. " + "If there are still such queries when the timeout expires, mariadb-backup " + "terminates with an error. Default is 0, in which case mariadb-backup waits " + "indefinitely for BACKUP STAGE START to finish", +@@ -5622,7 +5622,7 @@ void CorruptedPages::backup_fix_ddl(ds_c + } + + /* Mariabackup doesn't detect any FILE_OP for the deferred +- tablespace. There is a possiblity that page0 could've ++ tablespace. There is a possibility that page0 could've + been corrupted persistently in the disk */ + for (auto space_name: defer_space_names) { + if (!check_if_skip_table(space_name.c_str())) { +--- a/support-files/mysql.server.sh ++++ b/support-files/mysql.server.sh +@@ -194,7 +194,7 @@ su_kill() { + + # + # Read defaults file from 'basedir'. If there is no defaults file there +-# check if it's in the old (depricated) place (datadir) and read it from there ++# check if it's in the old (deprecated) place (datadir) and read it from there + # + + extra_args="" |