diff options
author | musvaage <musvaage@outlook.com> | 2022-12-20 17:41:24 -0600 |
---|---|---|
committer | Daniel Black <daniel@mariadb.org> | 2022-12-21 12:46:52 +1100 |
commit | 7c5609fb647b7b013694a16acae7c5c5739b394b (patch) | |
tree | e313efb759de1e9307411d7244bc1e261e34bb05 | |
parent | 3ddc00dc3bf29f7cf326268265e47fda61e6a83e (diff) | |
download | mariadb-git-7c5609fb647b7b013694a16acae7c5c5739b394b.tar.gz |
typos
-rw-r--r-- | mysql-test/suite/innodb_fts/t/innodb-fts-stopword.test | 16 | ||||
-rw-r--r-- | mysql-test/suite/innodb_fts/t/stopword.test | 16 | ||||
-rw-r--r-- | mysql-test/suite/parts/t/partition_repair_myisam.test | 2 | ||||
-rw-r--r-- | storage/connect/value.cpp | 8 | ||||
-rw-r--r-- | storage/innobase/row/row0row.cc | 4 | ||||
-rw-r--r-- | storage/maria/ma_locking.c | 2 | ||||
-rw-r--r-- | storage/maria/ma_loghandler.c | 2 | ||||
-rw-r--r-- | storage/myisam/mi_locking.c | 2 | ||||
-rw-r--r-- | storage/rocksdb/ha_rocksdb.cc | 2 |
9 files changed, 27 insertions, 27 deletions
diff --git a/mysql-test/suite/innodb_fts/t/innodb-fts-stopword.test b/mysql-test/suite/innodb_fts/t/innodb-fts-stopword.test index 0f29d092541..de14deab328 100644 --- a/mysql-test/suite/innodb_fts/t/innodb-fts-stopword.test +++ b/mysql-test/suite/innodb_fts/t/innodb-fts-stopword.test @@ -39,7 +39,7 @@ select @@innodb_ft_user_stopword_table; --error 1231 set global innodb_ft_server_stopword_table = "not_defined"; -# Define a correct formated user stopword table +# Define a correct formatted user stopword table create table user_stopword(value varchar(30)) engine = innodb; # The set operation should be successful @@ -319,11 +319,11 @@ INSERT INTO articles (title,body) VALUES # No records expeced for select SELECT * FROM articles WHERE MATCH(title,body) AGAINST("+show +will" IN BOOLEAN MODE); SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('will'); -# Define a correct formated user stopword table +# Define a correct formatted user stopword table create table user_stopword(value varchar(30)) engine = innodb; # The set operation should be successful set session innodb_ft_user_stopword_table = "test/user_stopword"; -# Define a correct formated server stopword table +# Define a correct formatted server stopword table create table server_stopword(value varchar(30)) engine = innodb; # The set operation should be successful set global innodb_ft_server_stopword_table = "test/server_stopword"; @@ -422,7 +422,7 @@ INSERT INTO articles (title,body) VALUES # No records expeced for select SELECT * FROM articles WHERE MATCH(title,body) AGAINST("+show +will" IN BOOLEAN MODE); SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('will'); -# Define a correct formated user stopword table +# Define a correct formatted user stopword table create table user_stopword(value varchar(30)) engine = innodb; # The set operation should be successful set session innodb_ft_user_stopword_table = "test/user_stopword"; @@ -444,7 +444,7 @@ SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('mysqld'); # set user stopword list empty set session innodb_ft_user_stopword_table = default; -# Define a correct formated user stopword table +# Define a correct formatted user stopword table create table server_stopword(value varchar(30)) engine = innodb; # The set operation should be successful set global innodb_ft_server_stopword_table = "test/server_stopword"; @@ -580,7 +580,7 @@ SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('"the will"@11' IN BOOL --connection con1 SET SESSION innodb_ft_enable_stopword = 1; -# Define a correct formated user stopword table +# Define a correct formatted user stopword table create table user_stopword(value varchar(30)) engine = innodb; # The set operation should be successful set session innodb_ft_user_stopword_table = "test/user_stopword"; @@ -599,7 +599,7 @@ SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('will'); SELECT * FROM articles WHERE MATCH(title,body) AGAINST("+show +will" IN BOOLEAN MODE); SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('will'); select @@innodb_ft_user_stopword_table; -# Define a correct formated user stopword table +# Define a correct formatted user stopword table create table user_stopword_1(value varchar(30)) engine = innodb; # The set operation should be successful set session innodb_ft_user_stopword_table = "test/user_stopword_1"; @@ -620,7 +620,7 @@ SET SESSION innodb_ft_enable_stopword = 1; SET SESSION innodb_ft_user_stopword_table=default; select @@innodb_ft_user_stopword_table; select @@innodb_ft_server_stopword_table; -# Define a correct formated server stopword table +# Define a correct formatted server stopword table create table server_stopword(value varchar(30)) engine = innodb; # The set operation should be successful SET GLOBAL innodb_ft_server_stopword_table = "test/server_stopword"; diff --git a/mysql-test/suite/innodb_fts/t/stopword.test b/mysql-test/suite/innodb_fts/t/stopword.test index 5105a6d2fec..ca01da80734 100644 --- a/mysql-test/suite/innodb_fts/t/stopword.test +++ b/mysql-test/suite/innodb_fts/t/stopword.test @@ -38,7 +38,7 @@ SET @innodb_ft_user_stopword_table_orig=@@innodb_ft_user_stopword_table; set global innodb_ft_server_stopword_table = "not_defined"; set global innodb_ft_server_stopword_table = NULL; -# Define a correct formated user stopword table +# Define a correct formatted user stopword table create table user_stopword(value varchar(30)) engine = innodb; # The set operation should be successful @@ -311,11 +311,11 @@ INSERT INTO articles (title,body) VALUES # No records expeced for select SELECT * FROM articles WHERE MATCH(title,body) AGAINST("+show +will" IN BOOLEAN MODE); SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('will'); -# Define a correct formated user stopword table +# Define a correct formatted user stopword table create table user_stopword(value varchar(30)) engine = innodb; # The set operation should be successful set session innodb_ft_user_stopword_table = "test/user_stopword"; -# Define a correct formated server stopword table +# Define a correct formatted server stopword table create table server_stopword(value varchar(30)) engine = innodb; # The set operation should be successful set global innodb_ft_server_stopword_table = "test/server_stopword"; @@ -411,7 +411,7 @@ INSERT INTO articles (title,body) VALUES # No records expeced for select SELECT * FROM articles WHERE MATCH(title,body) AGAINST("+show +will" IN BOOLEAN MODE); SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('will'); -# Define a correct formated user stopword table +# Define a correct formatted user stopword table create table user_stopword(value varchar(30)) engine = innodb; # The set operation should be successful set session innodb_ft_user_stopword_table = "test/user_stopword"; @@ -433,7 +433,7 @@ SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('mysqld'); # set user stopword list empty set session innodb_ft_user_stopword_table = default; -# Define a correct formated user stopword table +# Define a correct formatted user stopword table create table server_stopword(value varchar(30)) engine = innodb; # The set operation should be successful set global innodb_ft_server_stopword_table = "test/server_stopword"; @@ -572,7 +572,7 @@ SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('"the will"@11' IN BOOL --echo "In connection 1" --connection con1 SET SESSION innodb_ft_enable_stopword = 1; -# Define a correct formated user stopword table +# Define a correct formatted user stopword table create table user_stopword(value varchar(30)) engine = innodb; # The set operation should be successful set session innodb_ft_user_stopword_table = "test/user_stopword"; @@ -592,7 +592,7 @@ SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('will'); SELECT * FROM articles WHERE MATCH(title,body) AGAINST("+show +will" IN BOOLEAN MODE); SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('will'); select @@innodb_ft_user_stopword_table; -# Define a correct formated user stopword table +# Define a correct formatted user stopword table create table user_stopword_1(value varchar(30)) engine = innodb; # The set operation should be successful set session innodb_ft_user_stopword_table = "test/user_stopword_1"; @@ -614,7 +614,7 @@ SET SESSION innodb_ft_enable_stopword = 1; SET SESSION innodb_ft_user_stopword_table=default; select @@innodb_ft_user_stopword_table; select @@innodb_ft_server_stopword_table; -# Define a correct formated server stopword table +# Define a correct formatted server stopword table create table server_stopword(value varchar(30)) engine = innodb; # The set operation should be successful SET GLOBAL innodb_ft_server_stopword_table = "test/server_stopword"; diff --git a/mysql-test/suite/parts/t/partition_repair_myisam.test b/mysql-test/suite/parts/t/partition_repair_myisam.test index a21493ca03d..daa57b99211 100644 --- a/mysql-test/suite/parts/t/partition_repair_myisam.test +++ b/mysql-test/suite/parts/t/partition_repair_myisam.test @@ -150,7 +150,7 @@ while ($i) # 2 - after _mi_mark_file_changed (only marked index as opened) # 3 - after write_record (updated datafile + not closed/updated index) # 4 - after flush_cached_blocks (updated index/datafiles, not closed index) -# 5 - (Not used) after mi_state_info_write (fully uppdated/closed index file) +# 5 - (Not used) after mi_state_info_write (fully updated/closed index file) # (this was verified to be a harmless crash, since everything was written) # 6 - partly updated datafile (insert 6 small records, delete 5,3,1, # insert one larger record (2.5 X small) and break in gdb before it has diff --git a/storage/connect/value.cpp b/storage/connect/value.cpp index cc68c8694c7..9783d33b896 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) @@ -2864,7 +2864,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) diff --git a/storage/innobase/row/row0row.cc b/storage/innobase/row/row0row.cc index 6f34c9fcc9b..729baa369c8 100644 --- a/storage/innobase/row/row0row.cc +++ b/storage/innobase/row/row0row.cc @@ -1191,7 +1191,7 @@ row_raw_format_int( ulint buf_size, /*!< in: output buffer size in bytes */ ibool* format_in_hex) /*!< out: should the data be - formated in hex */ + formatted in hex */ { ulint ret; @@ -1239,7 +1239,7 @@ row_raw_format_str( ulint buf_size, /*!< in: output buffer size in bytes */ ibool* format_in_hex) /*!< out: should the data be - formated in hex */ + formatted in hex */ { ulint charset_coll; diff --git a/storage/maria/ma_locking.c b/storage/maria/ma_locking.c index a8cf936c873..c2a0f22d614 100644 --- a/storage/maria/ma_locking.c +++ b/storage/maria/ma_locking.c @@ -280,7 +280,7 @@ int _ma_readinfo(register MARIA_HA *info __attribute__ ((unused)), /* - Every isam-function that uppdates the isam-database MUST end with this + Every isam-function that updates the isam-database MUST end with this request NOTES diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c index 7e4fb5a8263..d6d2d5d6864 100644 --- a/storage/maria/ma_loghandler.c +++ b/storage/maria/ma_loghandler.c @@ -956,7 +956,7 @@ char *translog_filename_by_fileno(uint32 file_no, char *path) DBUG_ENTER("translog_filename_by_fileno"); DBUG_ASSERT(file_no <= 0xfffffff); - /* log_descriptor.directory is already formated */ + /* log_descriptor.directory is already formatted */ end= strxmov(path, log_descriptor.directory, "aria_log.0000000", NullS); length= (uint) (int10_to_str(file_no, buff, 10) - buff); strmov(end - length +1, buff); diff --git a/storage/myisam/mi_locking.c b/storage/myisam/mi_locking.c index 55185b67535..2039f572852 100644 --- a/storage/myisam/mi_locking.c +++ b/storage/myisam/mi_locking.c @@ -506,7 +506,7 @@ int _mi_readinfo(register MI_INFO *info, int lock_type, int check_keybuffer) /* - Every isam-function that uppdates the isam-database MUST end with this + Every isam-function that updates the isam-database MUST end with this request */ diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index aa934695322..b1a64b4aec0 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -7696,7 +7696,7 @@ int rdb_split_normalized_tablename(const std::string &fullname, into MyRocks Data Dictionary The method is called during create table/partition, truncate table/partition - @param table_name IN table's name formated as + @param table_name IN table's name formatted as 'dbname.tablename' @param table_arg IN sql table @param auto_increment_value IN specified table's auto increment value |