diff --git a/server/modules/filter/binlogfilter/binlogfiltersession.cc b/server/modules/filter/binlogfilter/binlogfiltersession.cc index f338c1a12be..05c5d68ecbd 100644 --- a/server/modules/filter/binlogfilter/binlogfiltersession.cc +++ b/server/modules/filter/binlogfilter/binlogfiltersession.cc @@ -183,7 +183,7 @@ bool BinlogFilterSession::routeQuery(GWBUF&& packet) * Extract binlog replication header from event data * * @param event The replication event - * @param hdr Pointer to repliction header to fill + * @param hdr Pointer to replication header to fill */ static void extract_header(const uint8_t* event, REP_HEADER* hdr) { @@ -280,7 +280,7 @@ bool BinlogFilterSession::clientReply(GWBUF&& packet, const mxs::ReplyRoute& dow * Member variable m_skip is set accordingly to db/table match. * * @param buffer The GWBUF with binlog event data - * @param hdr Reference to repliction event header + * @param hdr Reference to replication event header * @return True id TABLE_MAP_EVENT contains * db/table names to skip */ @@ -534,7 +534,7 @@ void BinlogFilterSession::replaceEvent(GWBUF& packet, const REP_HEADER& hdr) uint32_t buf_len = packet.length(); uint32_t orig_event_type = 0; - // If size < BINLOG_EVENT_HDR_LEN + crc32 add rand_event to buff contiguos + // If size < BINLOG_EVENT_HDR_LEN + crc32 add rand_event to buff contiguous mxb_assert(m_skip == true); /** @@ -656,7 +656,7 @@ void BinlogFilterSession::replaceEvent(GWBUF& packet, const REP_HEADER& hdr) } /** - * Extract the value of a specific columnr from a buffer + * Extract the value of a specific column from a buffer * TODO: also in use in binlogrouter code, to be moved * in a common place * @@ -761,9 +761,9 @@ void BinlogFilterSession::getReplicationChecksum(const GWBUF& packet) * If received data len is MYSQL_PACKET_LENGTH_MAX * then the beginning of a large event receiving is set. * - * Also remaininf data are set + * Also remaining data are set * - * @param len The binlog event paylod len + * @param len The binlog event payload len * @param hdr The reference to binlog event header */ void BinlogFilterSession::handlePackets(uint32_t len, const REP_HEADER& hdr) @@ -774,13 +774,13 @@ void BinlogFilterSession::handlePackets(uint32_t len, const REP_HEADER& hdr) // Mark the beginning of a large event transmission m_is_large = true; - // Set remaining data to receive accordingy to hdr.event_size + // Set remaining data to receive accordingly to hdr.event_size m_large_left = hdr.event_size - (MYSQL_PACKET_LENGTH_MAX - 1); } } /** - * Process received data size of a large event trasmission + * Process received data size of a large event transmission * Incoming data don't carry the OK byte and event header * * This sets member variables @@ -815,7 +815,7 @@ void BinlogFilterSession::handleEventData(uint32_t len) * This function checks whether the statement should be replicated and whether the database/table name should * be rewritten. If a rewrite takes place, the buffer can be reallocated. * - * @param bufer Pointer to the buffer containing the event + * @param buffer Pointer to the buffer containing the event * @param hdr The extracted replication header * @param extra_len Extra static bytes that this event has (only EXECUTE_LOAD_QUERY_EVENT uses it) */ diff --git a/server/modules/filter/binlogfilter/binlogfiltersession.hh b/server/modules/filter/binlogfilter/binlogfiltersession.hh index e3fbbd59ece..e8417186efb 100644 --- a/server/modules/filter/binlogfilter/binlogfiltersession.hh +++ b/server/modules/filter/binlogfilter/binlogfiltersession.hh @@ -72,7 +72,7 @@ private: // Reference to Filter instance const BinlogFilter& m_filter; - // Skip database/table events in current trasaction + // Skip database/table events in current transaction void skipDatabaseTable(const uint8_t* data); // Get Replication Checksum from registration query diff --git a/server/modules/filter/cache/cache.hh b/server/modules/filter/cache/cache.hh index ad5c0dc4f9d..e3fb678d392 100644 --- a/server/modules/filter/cache/cache.hh +++ b/server/modules/filter/cache/cache.hh @@ -106,7 +106,7 @@ public: const GWBUF& query); /** - * Specifies whether a particular SessioCache should refresh the data. + * Specifies whether a particular SessionCache should refresh the data. * * @param key The hashed key for a query. * @param pSession The session cache asking. diff --git a/server/modules/filter/cache/cache_storage_api.hh b/server/modules/filter/cache/cache_storage_api.hh index 6298fddd4a5..e3bdd6a47cd 100644 --- a/server/modules/filter/cache/cache_storage_api.hh +++ b/server/modules/filter/cache/cache_storage_api.hh @@ -275,7 +275,7 @@ public: uint32_t max_count = 0; /** - * The maximum size of the storage may may occupy, before it should evict + * The maximum size of the storage may occupy, before it should evict * some items. A value of 0 means that there is no limit. The caller should * specify 0, unless CACHE_STORAGE_CAP_MAX_SIZE is returned at initialization. */ @@ -345,10 +345,10 @@ public: * @param key A key generated with get_key. * @param flags Mask of cache_flags_t values. * @param soft_ttl The soft TTL. A value of CACHE_USE_CONFIG_TTL (-1) indicates - * that the value specfied in the config, used in the creation, + * that the value specified in the config, used in the creation, * should be used. * @param hard_ttl The hard TTL. A value of CACHE_USE_CONFIG_TTL (-1) indicates - * that the value specfied in the config, used in the creation, + * that the value specified in the config, used in the creation, * should be used. * @param ppValue Pointer to variable that after a successful return will * point to a GWBUF. diff --git a/server/modules/filter/cache/cacheconfig.cc b/server/modules/filter/cache/cacheconfig.cc index 9b147d5ddb6..13c415dd5a8 100644 --- a/server/modules/filter/cache/cacheconfig.cc +++ b/server/modules/filter/cache/cacheconfig.cc @@ -332,7 +332,7 @@ bool CacheConfig::post_configure(const std::mapsoft_ttl > this->hard_ttl) { diff --git a/server/modules/filter/cache/cacheconfig.hh b/server/modules/filter/cache/cacheconfig.hh index a720d8d6316..aa24ac4b789 100644 --- a/server/modules/filter/cache/cacheconfig.hh +++ b/server/modules/filter/cache/cacheconfig.hh @@ -89,7 +89,7 @@ private: bool post_configure(const std::map& nested_params) override; bool is_config_valid(const std::map& nested_params); - void make_config_adjustements(); + void make_config_adjustments(); private: CacheFilter* m_pFilter; diff --git a/server/modules/filter/cache/cachefiltersession.cc b/server/modules/filter/cache/cachefiltersession.cc index b12c6e5badf..8f943bd75b4 100644 --- a/server/modules/filter/cache/cachefiltersession.cc +++ b/server/modules/filter/cache/cachefiltersession.cc @@ -264,8 +264,8 @@ StatementType get_statement_type(std::string_view sql) if ((pKey == pKey_end) && ((pSql == pSql_end) || !isalpha(*pSql))) { // All is fine; either the statement only contain the keyword (so syntactically - // the statement is erroenous) or the keyword was followed by something else - // than an alhpanumeric character, e.g. whitespace. + // the statement is erroneous) or the keyword was followed by something else + // than an alphanumeric character, e.g. whitespace. } else { @@ -604,7 +604,7 @@ bool CacheFilterSession::clientReply(GWBUF&& data, const mxs::ReplyRoute& down, if (m_invalidate_now) { // The response to either a COMMIT, or to UPDATE/DELETE/INSERT with - // autcommit being true. + // autocommit being true. if (reply.is_complete()) { diff --git a/server/modules/filter/cache/cachefiltersession.hh b/server/modules/filter/cache/cachefiltersession.hh index 04e2f6eb76a..c369bd48d88 100644 --- a/server/modules/filter/cache/cachefiltersession.hh +++ b/server/modules/filter/cache/cachefiltersession.hh @@ -241,7 +241,7 @@ private: char* m_zDefaultDb; /**< The default database. */ char* m_zUseDb; /**< Pending default database. Needs server response. */ bool m_refreshing; /**< Whether the session is updating a stale cache entry. */ - bool m_is_read_only; /**< Whether the current trx has been read-only in pratice. */ + bool m_is_read_only; /**< Whether the current trx has been read-only in practice. */ bool m_use; /**< Whether the cache should be used in this session. */ bool m_populate; /**< Whether the cache should be populated in this session. */ uint32_t m_soft_ttl; /**< The soft TTL used in the session. */ diff --git a/server/modules/filter/cache/lrustorage.cc b/server/modules/filter/cache/lrustorage.cc index 33e687e7437..3f5c47f290f 100644 --- a/server/modules/filter/cache/lrustorage.cc +++ b/server/modules/filter/cache/lrustorage.cc @@ -199,7 +199,7 @@ class LRUStorage::LRUInvalidator : public LRUStorage::Invalidator if (node_words.size() > 1) { // If there are multiple invalidation words associated with - // the node, then the node must be removed from the bookeeping + // the node, then the node must be removed from the bookkeeping // of those words as well. Otherwise we have the following: // SELECT * FROM t1 UNION SELECT * FROM t2 => Node stored to t1 and t2. // DELETE * FROM t1 => Node removed from t1 and deleted diff --git a/server/modules/filter/cache/rules.cc b/server/modules/filter/cache/rules.cc index 38daf1a1aef..250cd62abc4 100644 --- a/server/modules/filter/cache/rules.cc +++ b/server/modules/filter/cache/rules.cc @@ -507,7 +507,7 @@ bool CacheRuleCTD::matches_column(const mxs::Parser& parser, if (databases.empty()) { // If no databases have been mentioned, then we can assume that all - // tables and columns that are not explcitly qualified refer to the + // tables and columns that are not explicitly qualified refer to the // default database. if (zDefault_db) { @@ -782,7 +782,7 @@ bool CacheRuleRegex::matches_column(const mxs::Parser& parser, if (databases.empty()) { // If no databases have been mentioned, then we can assume that all - // tables and columns that are not explcitly qualified refer to the + // tables and columns that are not explicitly qualified refer to the // default database. if (zDefault_db) { diff --git a/server/modules/filter/cache/rules.hh b/server/modules/filter/cache/rules.hh index b799c7dc13d..8c95eae1da8 100644 --- a/server/modules/filter/cache/rules.hh +++ b/server/modules/filter/cache/rules.hh @@ -121,7 +121,7 @@ protected: } const CacheConfig& m_config; // The cache config. - Attribute m_attribute; // What attribute is evalued. + Attribute m_attribute; // What attribute is evaluated. Op m_op; // What operator is used. std::string m_value; // The value from the rule file. }; @@ -202,7 +202,7 @@ class CacheRuleQuery final : public CacheRuleSimple { public: static CacheRuleQuery* create(const CacheConfig* pConfig, // The cache config. - Attribute attribute, // What attribute is evalued. + Attribute attribute, // What attribute is evaluated. Op op, // What operator is used. const char* zValue); // The value from the rule file. @@ -224,7 +224,7 @@ public: bool compare_n(const char* pValue, size_t length) const override final; static CacheRuleRegex* create(const CacheConfig* pConfig, // The cache config. - Attribute attribute, // What attribute is evalued. + Attribute attribute, // What attribute is evaluated. Op op, // What operator is used. const char* zValue); // The value from the rule file. @@ -253,7 +253,7 @@ class CacheRuleUser final : public CacheRule { public: static CacheRuleUser* create(const CacheConfig* pConfig, // The cache config. - Attribute attribute, // What attribute is evalued. + Attribute attribute, // What attribute is evaluated. Op op, // What operator is used. const char* zValue); // The value from the rule file. diff --git a/server/modules/filter/cache/storage/storage_redis/redisstorage.cc b/server/modules/filter/cache/storage/storage_redis/redisstorage.cc index 63dfb2d9b10..eaec33c2097 100644 --- a/server/modules/filter/cache/storage/storage_redis/redisstorage.cc +++ b/server/modules/filter/cache/storage/storage_redis/redisstorage.cc @@ -50,7 +50,7 @@ // // Note that we do not modify the set; deleting will not be performed other // than in error situations (and at the time of this writing is considered to -// be removed entirelly) and it does not really matter if an non-existing key +// be removed entirely) and it does not really matter if an non-existing key // is in the set. // // Invalidating @@ -859,7 +859,7 @@ class RedisToken : public std::enable_shared_from_this } else if (reply.is_status()) { - MXB_ERROR("Expected status OK as reponse to FLUSHALL, but received %s.", reply.str()); + MXB_ERROR("Expected status OK as response to FLUSHALL, but received %s.", reply.str()); } else { @@ -1231,7 +1231,7 @@ class RedisToken : public std::enable_shared_from_this // Does this work? Probably not in all cases; it appears that WATCH // needs to be used to prevent problems caused by the fetching of the keys - // and the deleteing of the keys (and values) being done in separate + // and the deleting of the keys (and values) being done in separate // transactions. m_redis.check_for_io_error(); diff --git a/server/modules/filter/cache/storagefactory.hh b/server/modules/filter/cache/storagefactory.hh index c36306f1a43..305f9cb2fc4 100644 --- a/server/modules/filter/cache/storagefactory.hh +++ b/server/modules/filter/cache/storagefactory.hh @@ -80,7 +80,7 @@ public: * provided. * * @param zName The name of the storage. - * @param config The storagfe configuration. + * @param config The storage configuration. * @param parameters Storage specific parameters. * * @return A storage instance or NULL in case of errors. @@ -98,7 +98,7 @@ public: * accordingly. * * @param zName The name of the storage. - * @param config The storagfe configuration. + * @param config The storage configuration. * @param parameters Storage specific parameters. * * @return A storage instance or NULL in case of errors. diff --git a/server/modules/filter/cache/test/input.test b/server/modules/filter/cache/test/input.test index 8dc4680ab19..d19ef5a87a8 100644 --- a/server/modules/filter/cache/test/input.test +++ b/server/modules/filter/cache/test/input.test @@ -297,7 +297,7 @@ insert into t2 values(10),(20); create table t3 like t1; show create table t3; select * from t3; -# Disable PS becasue of @@warning_count +# Disable PS because of @@warning_count create table if not exists t3 like t1; --disable_ps_protocol select @@warning_count; @@ -720,7 +720,7 @@ drop table t1; # Error during open_and_lock_tables() of tables --error ER_NO_SUCH_TABLE create table t1 select * from t2; -# A special case which is also caught during open tables pahse +# A special case which is also caught during open tables phase --error ER_NO_SUCH_TABLE create table t1 select * from t1; # Error which happens before select_create::prepare() @@ -751,12 +751,12 @@ drop table t1; create table t1 select coalesce('a' collate latin1_swedish_ci,'b' collate latin1_bin); -# Base vs temporary tables dillema (a.k.a. bug#24508 "Inconsistent +# Base vs temporary tables dilemma (a.k.a. bug#24508 "Inconsistent # results of CREATE TABLE ... SELECT when temporary table exists"). # In this situation we either have to create non-temporary table and # insert data in it or insert data in temporary table without creation of # permanent table. After patch for Bug#47418, we create the base table and -# instert data into it, even though a temporary table exists with the same +# insert data into it, even though a temporary table exists with the same # name. create temporary table t1 (j int); create table if not exists t1 select 1; @@ -817,7 +817,7 @@ drop table t1, t2; # -# Bug#21772: can not name a column 'upgrade' when create a table +# Bug#21772: cannot name a column 'upgrade' when create a table # create table t1 (upgrade int); drop table t1; @@ -826,7 +826,7 @@ drop table t1; --echo --echo Bug #26104 Bug on foreign key class constructor --echo ---echo Check that ref_columns is initalized correctly in the constructor +--echo Check that ref_columns is initialized correctly in the constructor --echo and semantic checks in mysql_prepare_table work. --echo --echo We do not need a storage engine that supports foreign keys @@ -1433,7 +1433,7 @@ DROP TEMPORARY TABLE t2; --echo # Bug #22909 "Using CREATE ... LIKE is possible to create field --echo # with invalid default value" --echo # ---echo # Altough original bug report suggests to use older version of MySQL +--echo # Although original bug report suggests to use older version of MySQL --echo # for producing .FRM with invalid defaults we use sql_mode to achieve --echo # the same effect. --disable_warnings @@ -2108,7 +2108,7 @@ DROP TABLE t1; # # Bug#27525: table not found when using multi-table-deletes with aliases over -# several databas +# several databases # Bug#21148: MULTI-DELETE fails to resolve a table by alias if it's from a # different database # @@ -2379,7 +2379,7 @@ DELETE v2 FROM v2; DROP VIEW v2, v1; DROP TABLE t1, t2; # -# Test of refering to old values +# Test of referring to old values # --disable_warnings @@ -2473,7 +2473,7 @@ use test; # Test of wrong values for float data (bug #2082) # -# PS gives sligthly different numbers for max-float/max-double +# PS gives slightly different numbers for max-float/max-double --disable_ps_protocol create table t1(number int auto_increment primary key, original_value varchar(50), f_double double, f_float float, f_double_7_2 double(7,2), f_float_4_3 float (4,3), f_double_u double unsigned, f_float_u float unsigned, f_double_15_1_u double(15,1) unsigned, f_float_3_1_u float (3,1) unsigned); @@ -3295,7 +3295,7 @@ select t1.i,t2.i,t3.i from t2 right join t3 on (t2.i=t3.i),t1 order by t1.i,t2.i drop table t1,t2,t3; # -# Bug #27531: Query performance degredation in 4.1.22 and greater +# Bug #27531: Query performance degradation in 4.1.22 and greater # CREATE TABLE t1 (a int, b int default 0, c int default 1); @@ -3426,7 +3426,7 @@ select * from (t1, t2) join (t3, t4) on (a < y and t2.b < t3.c); select * from (t1 natural join t2) join (t3 natural join t4) on a = y; select * from ((t3 join (t1 join t2 on c > a) on t3.b < t2.a) join t4 on y > t1.c) join t5 on z = t1.b + 3; -# MySQL extension - refererence qualified coalesced columns +# MySQL extension - reference qualified coalesced columns select * from t1 natural join t2 where t1.b > 0; select * from t1 natural join (t4 natural join t5) where t4.y > 7; select * from (t4 natural join t5) natural join t1 where t4.y > 7; @@ -3507,7 +3507,7 @@ select * from v1a join v1b on t1.b = t2.b; # # Bug #17523 natural join and information_schema # -# Omit columns.PRIVILIGES as it may vary with embedded server. +# Omit columns.PRIVILEGES as it may vary with embedded server. # Omit columns.ORDINAL_POSITION and statistics.CARDINALITY as it may vary with hostname='localhost'. select statistics.TABLE_NAME, statistics.COLUMN_NAME, statistics.TABLE_CATALOG, statistics.TABLE_SCHEMA, statistics.NON_UNIQUE, statistics.INDEX_SCHEMA, statistics.INDEX_NAME, statistics.SEQ_IN_INDEX, statistics.COLLATION, statistics.SUB_PART, statistics.PACKED, statistics.NULLABLE, statistics.INDEX_TYPE, statistics.COMMENT, @@ -5748,7 +5748,7 @@ select distinct t2.companynr,t4.companynr from t2,t4 where t2.companynr=t4.compa explain select distinct t2.companynr,t4.companynr from t2,t4 where t2.companynr=t4.companynr+1; # -# Search using 'or' with the same referens group. +# Search using 'or' with the same reference group. # An interval search will be done first with the first table and after that # the other table is referenced with a key with a 'test if key in use' for # each record @@ -5852,7 +5852,7 @@ select t2.companynr,count(*),min(fld3),max(fld3),sum(price),avg(price) from t2,t # # group with many tables and long group on many tables. group on formula -# optimizer: create tmp table with neaded fields +# optimizer: create tmp table with needed fields # sort tmp table by group and calculate sums to new table # if different order by than group, sort tmp table # send rows @@ -5982,7 +5982,7 @@ CREATE TABLE t1 (gvid int(10) unsigned default NULL, hmid int(10) unsigned defa INSERT INTO t1 VALUES (200001,2,1,1,100,1,1,1,0,0,0,1,0,1,20020425060057,'\\\\ARKIVIO-TESTPDC\\E$',''),(200002,2,2,1,101,1,1,1,0,0,0,1,0,1,20020425060057,'\\\\ARKIVIO-TESTPDC\\C$',''),(200003,1,3,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,1,20020425060427,'c:',NULL); CREATE TABLE t2 ( hmid int(10) unsigned default NULL, volid int(10) unsigned default NULL, sampletid smallint(5) unsigned default NULL, sampletime datetime default NULL, samplevalue bigint(20) unsigned default NULL, KEY idx1 (hmid,volid,sampletid,sampletime)) ENGINE=MyISAM; INSERT INTO t2 VALUES (1,3,10,'2002-06-01 08:00:00',35),(1,3,1010,'2002-06-01 12:00:01',35); -# Disable PS becasue we get more warnings from PS than from normal execution +# Disable PS because we get more warnings from PS than from normal execution --disable_ps_protocol SELECT a.gvid, (SUM(CASE b.sampletid WHEN 140 THEN b.samplevalue ELSE 0 END)) as the_success,(SUM(CASE b.sampletid WHEN 141 THEN b.samplevalue ELSE 0 END)) as the_fail,(SUM(CASE b.sampletid WHEN 142 THEN b.samplevalue ELSE 0 END)) as the_size,(SUM(CASE b.sampletid WHEN 143 THEN b.samplevalue ELSE 0 END)) as the_time FROM t1 a, t2 b WHERE a.hmid = b.hmid AND a.volid = b.volid AND b.sampletime >= 'wrong-date-value' AND b.sampletime < 'wrong-date-value' AND b.sampletid IN (140, 141, 142, 143) GROUP BY a.gvid; --enable_ps_protocol @@ -5991,7 +5991,7 @@ SELECT a.gvid, (SUM(CASE b.sampletid WHEN 140 THEN b.samplevalue ELSE 0 END)) as DROP TABLE t1,t2; # -# Test of bigint comparision +# Test of bigint comparison # create table t1 ( A_Id bigint(20) NOT NULL default '0', A_UpdateBy char(10) NOT NULL default '', A_UpdateDate bigint(20) NOT NULL default '0', A_UpdateSerial int(11) NOT NULL default '0', other_types bigint(20) NOT NULL default '0', wss_type bigint(20) NOT NULL default '0'); @@ -6045,7 +6045,7 @@ select * from t1 natural left join (t1 as t2 left join t1 as t3 using (a)); select * from (t1 as t2 left join t1 as t3 using (a)) right join t1 on t1.a>1; --sorted_result select * from t1 right join (t1 as t2 left join t1 as t3 using (a)) on t1.a>1; -# right [outer] joing using +# right [outer] join using select * from (t1 as t2 left join t1 as t3 using (a)) right outer join t1 using ( a ); select * from t1 right outer join (t1 as t2 left join t1 as t3 using (a)) using ( a ); # natural right join @@ -6491,7 +6491,7 @@ SELECT STRAIGHT_JOIN SQL_NO_CACHE * FROM t2, t1 WHERE t1.b = t2.b OR t2.b IS NUL DROP TABLE IF EXISTS t1,t2; # -# Bug #20954 "avg(keyval) retuns 0.38 but max(keyval) returns an empty set" +# Bug #20954 "avg(keyval) returns 0.38 but max(keyval) returns an empty set" # --disable_ps_protocol CREATE TABLE t1 (key1 float default NULL, UNIQUE KEY key1 (key1)); @@ -6691,7 +6691,7 @@ drop table t1,t2; drop view v1; # -# Bug #10646 Columns included in the join between two tables are ambigious +# Bug #10646 Columns included in the join between two tables are ambiguous # in the select # @@ -6738,7 +6738,7 @@ drop view v2; # -# Bug #4789 Incosistent results of more than 2-way natural joins due to +# Bug #4789 Inconsistent results of more than 2-way natural joins due to # incorrect transformation to join ... on. # @@ -6837,7 +6837,7 @@ SELECT id,t3.id FROM (t1 JOIN t2 ON (t2.id=t1.id)) LEFT JOIN t3 USING (id); drop table t1, t2, t3; # -# Bug #13067 JOIN xxx USING is case sensitive +# Bug #13067 JOIN xxx USING is case-sensitive # create table t1 (a int(10),b int(10)); @@ -7074,7 +7074,7 @@ select * from t1 left join t2 on f1=t2.f2 where t1.f2='a'; drop table t1,t2; # -# Bug#15538 unchecked table absense caused server crash. +# Bug#15538 unchecked table absence caused server crash. # --error 1064 select * from (select * left join t on f1=f2) tt; @@ -8774,7 +8774,7 @@ SELECT * FROM t1, t2 WHERE c=b AND (1=2 OR ((b='h' OR a=136) AND d=b)); DROP TABLE t1,t2; --echo # ---echo # Bug mdev-4944: range conditition in OR formula with fields +--echo # Bug mdev-4944: range condition in OR formula with fields --echo # belonging to multiple equalities --echo # @@ -8856,7 +8856,7 @@ drop table t1; # # followed by some fixes. # -# Lot's of duplicates, but that does not relly matter. +# Lot's of duplicates, but that does not really matter. # set global myisam_data_pointer_size=2; set global myisam_data_pointer_size=default; @@ -9249,7 +9249,7 @@ SET collation_connection=gb2312_chinese_ci; set names gb2312; set collation_connection=gb2312_bin; SET NAMES gbk; -# MXSTODO qc_sqlite can not parse quoted variables. +# MXSTODO qc_sqlite cannot parse quoted variables. # MXSTODO SET @`tcontent`:=_binary 0x50434B000900000000000000E9000000 COLLATE `binary`/*!*/; SET @test_character_set= 'gbk'; SET @test_collation= 'gbk_chinese_ci'; @@ -10857,7 +10857,7 @@ set sql_quote_show_create=1; set sql_mode=""; SET NAMES koi8r; SET NAMES latin1; -set @user123="non-existent"; +set @user123="nonexistent"; set names koi8r; set names latin1; set password for mysqltest_7@ = password('systpass'); @@ -15018,14 +15018,14 @@ SET optimizer_switch = 'semijoin=on,materialization=on,join_cache_hashed=on'; SET join_cache_level = 3; set @@optimizer_switch= @os_912513; set @@join_cache_level= @jcl_912513; -set @tmp_otimizer_switch= @@optimizer_switch; +set @tmp_optimizer_switch= @@optimizer_switch; set @tmp_join_cache_level=@@join_cache_level; set optimizer_switch = 'materialization=on,semijoin=on,join_cache_hashed=on'; set join_cache_level=0; set join_cache_level=6; set optimizer_switch=@tmp_optimizer_switch; set join_cache_level=@tmp_join_cache_level; -set @tmp_otimizer_switch= @@optimizer_switch; +set @tmp_optimizer_switch= @@optimizer_switch; set @tmp_join_cache_level=@@join_cache_level; set optimizer_switch = 'materialization=on,semijoin=on,join_cache_hashed=on'; set join_cache_level=0; @@ -15223,20 +15223,20 @@ set optimizer_switch=@tmp_877288; set @tmp878753= @@optimizer_switch; set optimizer_switch= 'semijoin=on,derived_merge=on'; set optimizer_switch=@tmp878753; -set @tmp_otimizer_switch= @@optimizer_switch; +set @tmp_optimizer_switch= @@optimizer_switch; set optimizer_switch='semijoin=on'; set optimizer_switch='firstmatch=off'; set optimizer_switch='semijoin_with_cache=on'; set optimizer_switch='semijoin_with_cache=off'; -set optimizer_switch= @tmp_otimizer_switch; -set @tmp_otimizer_switch= @@optimizer_switch; +set optimizer_switch= @tmp_optimizer_switch; +set @tmp_optimizer_switch= @@optimizer_switch; SET SESSION optimizer_switch='semijoin=on,firstmatch=on'; SET SESSION optimizer_switch='loosescan=off'; SET SESSION optimizer_switch='loosescan=on'; -set optimizer_switch= @tmp_otimizer_switch; -set @tmp_otimizer_switch= @@optimizer_switch; +set optimizer_switch= @tmp_optimizer_switch; +set @tmp_optimizer_switch= @@optimizer_switch; SET SESSION optimizer_switch='semijoin=on,materialization=on'; -set optimizer_switch= @tmp_otimizer_switch; +set optimizer_switch= @tmp_optimizer_switch; SET @tmp_optimizer_switch=@@optimizer_switch; SET @@optimizer_switch='semijoin=on'; SET @@optimizer_switch='materialization=on'; @@ -15759,7 +15759,7 @@ set @@autocommit=0; set @@autocommit=1; set @@global.general_log=@save_general_log; SET TIMESTAMP=10000; -# MXSTODO qc_sqlite can not parse quoted variables. +# MXSTODO qc_sqlite cannot parse quoted variables. # MXSTODO SET @`a b`='hello'; set @var1= "';aaa"; SET @var2=char(ascii('a')); @@ -15863,12 +15863,12 @@ set @my_max_allowed_packet =@@global.max_allowed_packet; set @my_delay_key_write =@@global.delay_key_write; set @my_join_buffer_size =@@global.join_buffer_size; set @my_log_warnings =@@global.log_warnings; -# MXSTODO qc_sqlite can not parse quoted variables. +# MXSTODO qc_sqlite cannot parse quoted variables. # MXSTODO set @`test`=1; set @TEST=2; -# MXSTODO qc_sqlite can not parse quoted variables. +# MXSTODO qc_sqlite cannot parse quoted variables. # MXSTODO set @"tEST"=3; -# MXSTODO qc_sqlite can not parse quoted variables. +# MXSTODO qc_sqlite cannot parse quoted variables. # MXSTODO set @`TeST`=4; set @select=2,@t5=1.23456; set @test_int=10,@test_double=1e-10,@test_string="abcdeghi",@test_string2="abcdefghij",@select=NULL; diff --git a/server/modules/filter/cache/test/testerstorage.cc b/server/modules/filter/cache/test/testerstorage.cc index 721fc976910..a36868f38cf 100644 --- a/server/modules/filter/cache/test/testerstorage.cc +++ b/server/modules/filter/cache/test/testerstorage.cc @@ -380,7 +380,7 @@ int TesterStorage::test_ttl(const CacheItems& cache_items, Storage& storage) // We should get the item normally as we are below the soft ttl, i.e. no stale bit. if (result != CACHE_RESULT_OK) { - out() << "Excpected to be found, and without stale bit." << endl; + out() << "Expected to be found, and without stale bit." << endl; rv = EXIT_FAILURE; } diff --git a/server/modules/filter/cache/test/testerstorage.hh b/server/modules/filter/cache/test/testerstorage.hh index 3f3be71ab3a..37b5dfa2fa4 100644 --- a/server/modules/filter/cache/test/testerstorage.hh +++ b/server/modules/filter/cache/test/testerstorage.hh @@ -33,7 +33,7 @@ public: * @class HitTask * * A task whose sole purpose is to hit a Storage continuously - * and intensly. + * and intensely. */ class HitTask : public Tester::Task { diff --git a/server/modules/filter/ccrfilter/ccrfilter.cc b/server/modules/filter/ccrfilter/ccrfilter.cc index ac32992435b..b6f3a83e477 100644 --- a/server/modules/filter/ccrfilter/ccrfilter.cc +++ b/server/modules/filter/ccrfilter/ccrfilter.cc @@ -110,8 +110,8 @@ config::ParamRegex ignore( config::ParamEnumMask options( &specification, "options", - "Specificies additional options for the regular expressions; 'ignorecase' makes the " - "matching case insensitive (on by default), 'case' makes the matching case sensitive " + "Specifies additional options for the regular expressions; 'ignorecase' makes the " + "matching case-insensitive (on by default), 'case' makes the matching case-sensitive " "and 'extended' causes whitespace to be ignored. They have been deprecated and you " "should instead use pattern settings in the regular expressions themselves.", { diff --git a/server/modules/filter/luafilter/luacontext.cc b/server/modules/filter/luafilter/luacontext.cc index 44c4a6b3225..7be5344b08f 100644 --- a/server/modules/filter/luafilter/luacontext.cc +++ b/server/modules/filter/luafilter/luacontext.cc @@ -23,7 +23,7 @@ namespace { const char* CN_CREATE_INSTANCE = "createInstance"; -const char* CN_NEW_SESSON = "newSession"; +const char* CN_NEW_SESSION = "newSession"; const char* CN_ROUTE_QUERY = "routeQuery"; const char* CN_CLIENT_REPLY = "clientReply"; const char* CN_CLOSE_SESSION = "closeSession"; @@ -323,7 +323,7 @@ void LuaContext::create_instance(const std::string& name) void LuaContext::new_session(MXS_SESSION* session) { m_data = LuaData{session, nullptr, nullptr}; - call_function(m_state, CN_NEW_SESSON, 0, session->user(), session->client_remote()); + call_function(m_state, CN_NEW_SESSION, 0, session->user(), session->client_remote()); } bool LuaContext::route_query(MXS_SESSION* session, GWBUF* buffer) diff --git a/server/modules/filter/masking/maskingfilterconfig.cc b/server/modules/filter/masking/maskingfilterconfig.cc index 7a3ef4767be..d4430899308 100644 --- a/server/modules/filter/masking/maskingfilterconfig.cc +++ b/server/modules/filter/masking/maskingfilterconfig.cc @@ -68,7 +68,7 @@ config::ParamBool prevent_function_usage( config::ParamBool check_user_variables( &specification, "check_user_variables", - "If true, then SET statemens that are defined using SELECT referring to " + "If true, then SET statements that are defined using SELECT referring to " "masked columns will be blocked.", true, config::Param::AT_RUNTIME); @@ -76,7 +76,7 @@ config::ParamBool check_user_variables( config::ParamBool check_unions( &specification, "check_unions", - "If true, then if the second SELECT in a UNION refers to a masked colums " + "If true, then if the second SELECT in a UNION refers to a masked columns " "the statement will be blocked.", true, config::Param::AT_RUNTIME); diff --git a/server/modules/filter/masking/maskingrules.cc b/server/modules/filter/masking/maskingrules.cc index 72d575bbb25..3813199cb53 100644 --- a/server/modules/filter/masking/maskingrules.cc +++ b/server/modules/filter/masking/maskingrules.cc @@ -696,7 +696,7 @@ static bool rule_get_common_values(json_t* pRule, json_t* pTable = json_object_get(pRule, KEY_TABLE); json_t* pColumn = json_object_get(pRule, KEY_COLUMN); - // Check column/table/dataase + // Check column/table/database if (!rule_check_database_options(pColumn, pTable, pDatabase, @@ -801,7 +801,7 @@ bool rule_get_match_value_fill(json_t* pRule, json_t* pTheFill = rule_get_fill(pWith); // Get value from 'with' object json_t* pTheValue = json_object_get(pWith, KEY_VALUE); - // Get 'match' from 'replace' ojbect + // Get 'match' from 'replace' object json_t* pTheMatch = json_object_get(pKeyObj, KEY_MATCH); // Check values: 'match' and 'fill' are mandatory (if not provided, there will be @@ -1159,7 +1159,7 @@ bool MaskingRules::Rule::matches_account(const char* zUser, /** * Fills a buffer with a fill string * - * @param f_first The iterator pointing to first fill byt + * @param f_first The iterator pointing to first fill byte * @param f_last The iterator pointing to last fill byte * @param o_first The iterator pointing to first buffer byte * @param o_last The iterator pointing to last buffer byte @@ -1237,7 +1237,7 @@ void MaskingRules::MatchRule::rewrite(mxq::LEncString& s) const pcre2_match_data_free(pData); - // Log errors, exclding NO_MATCH or PARTIAL + // Log errors, excluding NO_MATCH or PARTIAL if (rv < 0 && (rv != PCRE2_ERROR_NOMATCH || PCRE2_ERROR_PARTIAL)) { MXS_PCRE2_PRINT_ERROR(rv); diff --git a/server/modules/filter/masking/mysql.hh b/server/modules/filter/masking/mysql.hh index 7cd2a272214..69c193858d4 100644 --- a/server/modules/filter/masking/mysql.hh +++ b/server/modules/filter/masking/mysql.hh @@ -528,7 +528,7 @@ public: << "\nOrg table : " << m_org_table << "\nName : " << m_name << "\nOrd name : " << m_org_name - << "\nCharacer set : " << m_character_set + << "\nCharacter set: " << m_character_set << "\nColumn length: " << m_column_length << "\nType : " << (uint16_t)m_type << "\nFlags : " << m_flags diff --git a/server/modules/filter/namedserverfilter/namedserverfilter.cc b/server/modules/filter/namedserverfilter/namedserverfilter.cc index 927aa4ba5fa..ba5febbc82f 100644 --- a/server/modules/filter/namedserverfilter/namedserverfilter.cc +++ b/server/modules/filter/namedserverfilter/namedserverfilter.cc @@ -501,7 +501,7 @@ mxs::FilterSession* RegexHintFilter::newSession(MXS_SESSION* session, SERVICE* s * Find the first server list with a matching regular expression. * * @param sql SQL-query string, not null-terminated - * @paran sql_len length of SQL-query + * @param sql_len length of SQL-query * @return A set of servers from the main mapping container */ const RegexToServers* RegexHintFSession::find_servers(const char* sql, int sql_len) diff --git a/server/modules/filter/nullfilter/nullfilter.cc b/server/modules/filter/nullfilter/nullfilter.cc index 4392cded1b5..68def914e84 100644 --- a/server/modules/filter/nullfilter/nullfilter.cc +++ b/server/modules/filter/nullfilter/nullfilter.cc @@ -31,7 +31,7 @@ config::Specification specification(MXB_MODULE_NAME, config::Specification::FILT config::ParamEnumMask capabilities( &specification, "capabilities", - "Combination of mxs_routing_capabilitiy_t values.", + "Combination of mxs_routing_capability_t values.", { {RCAP_TYPE_STMT_INPUT, "RCAP_TYPE_STMT_INPUT"}, {RCAP_TYPE_TRANSACTION_TRACKING, "RCAP_TYPE_TRANSACTION_TRACKING"}, diff --git a/server/modules/filter/qlafilter/qlafilter.cc b/server/modules/filter/qlafilter/qlafilter.cc index 271375666bb..63e896be0a8 100644 --- a/server/modules/filter/qlafilter/qlafilter.cc +++ b/server/modules/filter/qlafilter/qlafilter.cc @@ -13,7 +13,7 @@ */ /** - * @file qlafilter.cc - Quary Log All Filter + * @file qlafilter.cc - Query Log All Filter * * QLA Filter - Query Log All. A simple query logging filter. All queries passing * through the filter are written to a text file. diff --git a/server/modules/filter/qlafilter/qlalog.cc b/server/modules/filter/qlafilter/qlalog.cc index 61b31c1c648..ddf2808595f 100644 --- a/server/modules/filter/qlafilter/qlalog.cc +++ b/server/modules/filter/qlafilter/qlalog.cc @@ -44,7 +44,7 @@ void QlaLog::finish_for(maxscale::RoutingWorker* pWorker) decrease_client_count(pWorker->index()); } -/// NOTE: There is a very small caveat with flusing only the last element in the queue. +/// NOTE: There is a very small caveat with flushing only the last element in the queue. /// If within the queue the current file changes, then the explicit flush to the /// current file will happen before the flush of the previous file, which is /// flushed when the smart_ptr to it is destroyed after this call finishes. diff --git a/server/modules/filter/rewritefilter/native_replacer.hh b/server/modules/filter/rewritefilter/native_replacer.hh index 0706206b147..8806dd3d5be 100644 --- a/server/modules/filter/rewritefilter/native_replacer.hh +++ b/server/modules/filter/rewritefilter/native_replacer.hh @@ -88,7 +88,7 @@ Iterator read_placeholder(const Iterator cfirst, const Iterator last, pRegex->clear(); auto first = cfirst; - // Should start with with "@{" + // Should start with "@{" if (*first != '@' || ++first == last || *first != '{' || ++first == last) { *pOrdinal = 0; // not a placeholder diff --git a/server/modules/filter/rewritefilter/native_rewriter.hh b/server/modules/filter/rewritefilter/native_rewriter.hh index df15cb4cd81..d571540fc35 100644 --- a/server/modules/filter/rewritefilter/native_rewriter.hh +++ b/server/modules/filter/rewritefilter/native_rewriter.hh @@ -32,7 +32,7 @@ class NativeReplacer; * replace_template: "select count(*) from (select distinct @{1} from @{2}) as t" * * TODO: There are very few examples of rewrites, but it is relatively certain that - * the distinction between an indentifier and a number will be needed: + * the distinction between an identifier and a number will be needed: * @{1:s} and @{1:d}. Or 'i' and 'n' if that is clearer to users. */ class NativeRewriter : public SqlRewriter diff --git a/server/modules/filter/rewritefilter/regex_rewriter.cc b/server/modules/filter/rewritefilter/regex_rewriter.cc index 6db383fc3e2..ec86565a354 100644 --- a/server/modules/filter/rewritefilter/regex_rewriter.cc +++ b/server/modules/filter/rewritefilter/regex_rewriter.cc @@ -46,7 +46,7 @@ bool RegexRewriter::replace(const std::string& sql, std::string* pSql) const { // This is inefficient, regex_replace() does not indicate if a match // happened but instead returns the original sql when there is no - // match (what was the standards comittee thinking?). + // match (what was the standards committee thinking?). std::smatch match; matched = std::regex_search(sql, match, m_match_regex); diff --git a/server/modules/filter/rewritefilter/regex_rewriter.hh b/server/modules/filter/rewritefilter/regex_rewriter.hh index 9e82298a7e2..86b2b6b2ede 100644 --- a/server/modules/filter/rewritefilter/regex_rewriter.hh +++ b/server/modules/filter/rewritefilter/regex_rewriter.hh @@ -34,7 +34,7 @@ class NativeReplacer; * feature request if a problem really cannot be solved * with the NativeRewriter. * - * TODO: add an option to only replace the first occurance. + * TODO: add an option to only replace the first occurrence. */ class RegexRewriter : public SqlRewriter { diff --git a/server/modules/filter/rewritefilter/rewritesession.cc b/server/modules/filter/rewritefilter/rewritesession.cc index b73ec67be31..6ce5a5edeef 100644 --- a/server/modules/filter/rewritefilter/rewritesession.cc +++ b/server/modules/filter/rewritefilter/rewritesession.cc @@ -12,7 +12,7 @@ * Public License. */ -#define MXB_MODULE_NAME "rewitefilter" +#define MXB_MODULE_NAME "rewritefilter" #include "rewritesession.hh" #include #include "rewritefilter.hh" diff --git a/server/modules/filter/rewritefilter/rf_reader.cc b/server/modules/filter/rewritefilter/rf_reader.cc index afdac13d21b..4aa8f05c2ec 100644 --- a/server/modules/filter/rewritefilter/rf_reader.cc +++ b/server/modules/filter/rewritefilter/rf_reader.cc @@ -39,7 +39,7 @@ # inserted as '\n'. Whitespace does not matter as long as # ignore_whitespace = true. # However, note that "id=42" is not the same as "id = 42" -# in the match tamplate even with ignore_whitespace = true. +# in the match template even with ignore_whitespace = true. # The parser cannot know that id=42 should be prepped for # ignoring space, so it is best to always use space where # space is allowed. diff --git a/server/modules/filter/test/maxscale/mock/client.hh b/server/modules/filter/test/maxscale/mock/client.hh index 2692e7df5e4..bfa79134800 100644 --- a/server/modules/filter/test/maxscale/mock/client.hh +++ b/server/modules/filter/test/maxscale/mock/client.hh @@ -109,7 +109,7 @@ public: size_t n_responses() const; /** - * Reset the Client object. The number of counted responsed will + * Reset the Client object. The number of counted responded will * be set to 0. If the Client object has a handler, then its @c reset * function will be called as well. */ diff --git a/server/modules/filter/test/maxscale/queryclassifiermodule.hh b/server/modules/filter/test/maxscale/queryclassifiermodule.hh index 51c17a68547..b6046e725ad 100644 --- a/server/modules/filter/test/maxscale/queryclassifiermodule.hh +++ b/server/modules/filter/test/maxscale/queryclassifiermodule.hh @@ -22,7 +22,7 @@ namespace maxscale { /** - * A QueryClassfierModule instance is an abstraction for a query + * A QueryClassifierModule instance is an abstraction for a query * classifier module. */ class QueryClassifierModule : public SpecificModule diff --git a/server/modules/filter/topfilter/topfilter.cc b/server/modules/filter/topfilter/topfilter.cc index 87d9c9c20c5..25437632ca9 100644 --- a/server/modules/filter/topfilter/topfilter.cc +++ b/server/modules/filter/topfilter/topfilter.cc @@ -115,7 +115,7 @@ class Config : public mxs::config::Configuration struct Values { int64_t count; /* Number of queries to store */ - std::string filebase; /* Base of fielname to log into */ + std::string filebase; /* Base of filename to log into */ std::string source; /* The source of the client connection */ std::string user; /* A user name to filter on */ uint32_t options; /* Regex options */