Skip to content

fixed typo #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 24 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Docs/sp-imp-spec.txt
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@

The existance of UDFs are checked during the lexical analysis (in
sql_lex.cc:find_keyword()). This has the drawback that they must
exist before they are refered to, which was ok before SPs existed,
exist before they are referred to, which was ok before SPs existed,
but then it becomes a problem. The first implementation of SP FUNCTIONs
will work the same way, but this should be fixed a.s.a.p. (This will
required some reworking of the way UDFs are handled, which is why it's
Expand Down Expand Up @@ -329,7 +329,7 @@
of the mysql.proc table during a query execution, but this it not
possible at the present.

So, the solution is to collect the names of the refered FUNCTIONs during
So, the solution is to collect the names of the referred FUNCTIONs during
parsing in the lex.
Then, before doing anything else in mysql_execute_command(), read all
functions from the database an keep them in the THD, where the function
Expand Down
2 changes: 1 addition & 1 deletion client/mysqltest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9182,7 +9182,7 @@ int main(int argc, char **argv)
var_set_string("MYSQLTEST_FILE", cur_file->file_name);
init_re();

/* Cursor protcol implies ps protocol */
/* Cursor protocol implies ps protocol */
if (cursor_protocol)
ps_protocol= 1;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ class LIBPROTOBUF_EXPORT Tokenizer {

// -----------------------------------------------------------------
// These helper methods make the parsing code more readable. The
// "character classes" refered to are defined at the top of the .cc file.
// "character classes" referred to are defined at the top of the .cc file.
// Basically it is a C++ class with one method:
// static bool InClass(char c);
// The method returns true if c is a member of this "class", like "Letter"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class TestUtil {
static void SetOneof2(unittest::TestOneof2* message);

// Use the repeated versions of the set_*() accessors to modify all the
// repeated fields of the messsage (which should already have been
// repeated fields of the message (which should already have been
// initialized with Set*Fields()). Set*Fields() itself only tests
// the add_*() accessors.
static void ModifyRepeatedFields(unittest::TestAllTypes* message);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class TestUtilLite {
static void SetPackedExtensions(unittest::TestPackedExtensionsLite* message);

// Use the repeated versions of the set_*() accessors to modify all the
// repeated fields of the messsage (which should already have been
// repeated fields of the message (which should already have been
// initialized with Set*Fields()). Set*Fields() itself only tests
// the add_*() accessors.
static void ModifyRepeatedFields(unittest::TestAllTypesLite* message);
Expand Down
4 changes: 2 additions & 2 deletions extra/yassl/include/buffer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class input_buffer : public Check {

~input_buffer();

// users can pass defualt zero length buffer and then allocate
// users can pass default zero length buffer and then allocate
void allocate(uint s);

// for passing to raw writing functions at beginning, then use add_size
Expand Down Expand Up @@ -158,7 +158,7 @@ class output_buffer : public NoCheck {

void set_current(uint c);

// users can pass defualt zero length buffer and then allocate
// users can pass default zero length buffer and then allocate
void allocate(uint s);

// for passing to reading functions when finished
Expand Down
4 changes: 2 additions & 2 deletions extra/yassl/src/buffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ input_buffer::~input_buffer()
}


// users can pass defualt zero length buffer and then allocate
// users can pass default zero length buffer and then allocate
void input_buffer::allocate(uint s)
{
if (error_ == 0) {
Expand Down Expand Up @@ -287,7 +287,7 @@ void output_buffer::set_current(uint c)
}


// users can pass defualt zero length buffer and then allocate
// users can pass default zero length buffer and then allocate
void output_buffer::allocate(uint s)
{
buffer_ = NEW_YS byte[s]; end_ = buffer_ + s;
Expand Down
2 changes: 1 addition & 1 deletion extra/yassl/src/ssl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ int SSL_connect(SSL* ssl)
return SSL_SUCCESS;

default :
return SSL_FATAL_ERROR; // unkown state
return SSL_FATAL_ERROR; // unknown state
}
}

Expand Down
4 changes: 2 additions & 2 deletions extra/yassl/src/yassl_error.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -242,11 +242,11 @@ void SetErrorString(YasslError error, char* buffer)
strncpy(buffer, "ASN: bad Signature Length", max);
break;

case UNKOWN_SIG_E :
case UNKNOWN_SIG_E :
strncpy(buffer, "ASN: unknown signature OID", max);
break;

case UNKOWN_HASH_E :
case UNKNOWN_HASH_E :
strncpy(buffer, "ASN: unknown hash OID", max);
break;

Expand Down
4 changes: 2 additions & 2 deletions extra/yassl/taocrypt/include/error.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ TIME_E = 1030, // "bad TIME"

DATE_SZ_E = 1031, // "bad Date Size"
SIG_LEN_E = 1032, // "bad Signature Length"
UNKOWN_SIG_E = 1033, // "unknown signature OID"
UNKOWN_HASH_E = 1034, // "unknown hash OID"
UNKNOWN_SIG_E = 1033, // "unknown signature OID"
UNKNOWN_HASH_E = 1034, // "unknown hash OID"
DSA_SZ_E = 1035, // "bad DSA r or s size"
BEFORE_DATE_E = 1036, // "before date in the future"
AFTER_DATE_E = 1037, // "after date in the past"
Expand Down
4 changes: 2 additions & 2 deletions extra/yassl/taocrypt/src/asn.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1012,7 +1012,7 @@ bool CertDecoder::ConfirmSignature(Source& pub)
}
#endif
else {
source_.SetError(UNKOWN_SIG_E);
source_.SetError(UNKNOWN_SIG_E);
return false;
}

Expand Down Expand Up @@ -1136,7 +1136,7 @@ word32 DER_Encoder::SetAlgoID(HashType aOID, byte* output)
break;

default:
error_.SetError(UNKOWN_HASH_E);
error_.SetError(UNKNOWN_HASH_E);
return 0;
}

Expand Down
2 changes: 1 addition & 1 deletion libevent/event.c
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ event_add(struct event *ev, const struct timeval *tv)
}

/*
* we should change the timout state only if the previous event
* we should change the timeout state only if the previous event
* addition succeeded.
*/
if (res != -1 && tv != NULL) {
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/include/execute_with_statistics.inc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# SUMMARY
#
# Explain and execute the select statment in $query.
# Explain and execute the select statement in $query.
# Then report 'Last_query_cost' estimate from the query
# optimizer and total number of 'Handler_read%' when the
# query was executed.
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/include/gtid_prepare_and_execute_stmt.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# ==== Implementation ====
#
# 1. SET SESSION GTID_NEXT='UUID:GNO'
# 2. Prepare a statment
# 2. Prepare a statement
# 3. Execute the statement
# 4. See that an entry is added in 'gtid_executed' table.
#
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/include/index_merge_delete.inc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CREATE TABLE t2 LIKE t1;
INSERT INTO t2 SELECT * FROM t1;
ANALYZE TABLE t2;

#1. SQL statments with various combinations of comparison operators
#1. SQL statements with various combinations of comparison operators

# union and sort_union

Expand Down
2 changes: 1 addition & 1 deletion mysql-test/include/select.inc
Original file line number Diff line number Diff line change
Expand Up @@ -1825,7 +1825,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
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/include/varchar.inc
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ select v,count(t) from t1 group by v limit 10;
select sql_big_result v,count(t) from t1 group by v limit 10;

#
# Test varchar > 512 (special case for GROUP BY becasue of
# Test varchar > 512 (special case for GROUP BY because of
# CONVERT_IF_BIGGER_TO_BLOB define)
#

Expand Down
2 changes: 1 addition & 1 deletion mysql-test/lib/v1/mysql-test-run.pl
Original file line number Diff line number Diff line change
Expand Up @@ -1030,7 +1030,7 @@ ()
}

# --------------------------------------------------------------------------
# ps protcol flag
# ps protocol flag
# --------------------------------------------------------------------------
if ( $opt_ps_protocol )
{
Expand Down
6 changes: 3 additions & 3 deletions mysql-test/suite/ndb/t/ndb_join_pushdown.inc
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ where t1.a = 2 and t1.b = 3;
# - Same query as above.
# - Added explict table locks as cleanup of these is one
# (of several?) way to cause released NdbQuery objects to
# be refered.
# be referred.
################################################################

# LOCK'ed tables invokes the same code path as executing
Expand Down Expand Up @@ -534,7 +534,7 @@ where t2.a = 1;
# to find a single common parent by using the equality set
#
# NOTE: We should take care to join the multiparent linked
# table on field refs. not also being refered from other join expr.
# table on field refs. not also being referred from other join expr.
# as this will make them candidates for equality set replacement.
#
set ndb_join_pushdown=true;
Expand Down Expand Up @@ -1916,7 +1916,7 @@ select straight_join * from


###########################
### Prepared statments ####
### Prepared statements ###
###########################

prepare stmt1 from
Expand Down
4 changes: 2 additions & 2 deletions mysql-test/suite/ndb/t/ndb_multi.test
Original file line number Diff line number Diff line change
Expand Up @@ -400,10 +400,10 @@ create table t1(x int) engine=ndb;
create table t2(b int primary key) engine=ndb;
create table t3_default_engine(c int primary key);
--let $MYSQLD_DATADIR= `SELECT @@datadir`
# Write emtpy .ndb file with normal file name
# Write empty .ndb file with normal file name
--write_file $MYSQLD_DATADIR/db/t4.ndb
EOF
# Write emtpy .ndb file with temporary file name
# Write empty .ndb file with temporary file name
--write_file $MYSQLD_DATADIR/db/#sql-1c17_25d0.ndb
EOF

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ insert into binlog_stmt_parts_assoc
create table binlog_stmts (txt varchar(1000), stmt_num int);

insert into binlog_stmts
select group_concat(right(txt, # Combine rows in statment into 1
select group_concat(right(txt, # Combine rows in statement into 1
length(txt) - 4) # Trim ### from line start
order by line_count
separator ' '), stmt_num
Expand All @@ -68,7 +68,7 @@ insert into binlog_stmts

#select * from binlog_stmts;

# Drop ndb_apply_status entries and sort by the statment
# Drop ndb_apply_status entries and sort by the statement
# text to get a deterministic order.
#
# Reasonable order would be sort by (PK-cols, stmt_num)
Expand Down
4 changes: 2 additions & 2 deletions mysql-test/suite/parts/inc/partition_11.inc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ eval SET @my_errno= $mysql_errno ;
let $run= `SELECT @my_errno = 0`;
--enable_query_log
#
# If this operation was successfull, check + drop this table
# If this operation was successful, check + drop this table
if ($run)
{
--source suite/parts/inc/partition_10.inc
Expand All @@ -26,7 +26,7 @@ eval SET @my_errno= $mysql_errno ;
let $run= `SELECT @my_errno = 0`;
--enable_query_log
#
# If this operation was successfull, check + drop this table
# If this operation was successful, check + drop this table
if ($run)
{
--source suite/parts/inc/partition_10.inc
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/parts/inc/partition_check.inc
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ INSERT INTO t1
SET f_int1 = NULL , f_int2 = -@max_row,
f_char1 = CAST(-@max_row AS CHAR), f_char2 = CAST(-@max_row AS CHAR),
f_charbig = '#NULL#';
# Some other NULL experiments if preceding INSERT was successfull
# Some other NULL experiments if preceding INSERT was successful
--enable_abort_on_error
if ($no_debug)
{
Expand Down
4 changes: 2 additions & 2 deletions mysql-test/suite/parts/inc/partition_syntax_1.inc
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ if (`SELECT @my_errno NOT IN (0,$ER_PARSE_ERROR,$ER_TOO_MANY_PARTITIONS_ERROR,
}
--enable_query_log
#
# If this operation was successfull, print layout + drop this table
# If this operation was successful, print layout + drop this table
if ($run)
{
--source suite/parts/inc/partition_layout_check1.inc
Expand Down Expand Up @@ -77,7 +77,7 @@ if (`SELECT @my_errno NOT IN (0,$ER_PARSE_ERROR,$ER_TOO_MANY_PARTITIONS_ERROR,
}
--enable_query_log
#
# If this operation was successfull, print layout + drop this table
# If this operation was successful, print layout + drop this table
if ($run)
{
--source suite/parts/inc/partition_layout_check1.inc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
CREATE TABLE t1 (a INT NOT NULL);
INSERT INTO t1 VALUES (4), (8), (11), (32), (80);

# Prepared statments
# Prepared statements

PREPARE st1 FROM 'SELECT SQRT(POW(?,2) + POW(?,2)) AS hypotenuse';

Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/rpl/include/rpl_partition.inc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ BEGIN
SET local_uuid= "36774b1c-6374-11df-a2ca-0ef7ac7a5f6c";

WHILE ins_count > 0 DO
# Must use local variables for statment based replication
# Must use local variables for statement based replication
INSERT INTO test.regular_tbl VALUES (NULL, NOW(), cur_user, local_uuid,
ins_count,'Non partitioned table! Going to test replication for MySQL');
SET ins_count = ins_count - 1;
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/rpl_ndb/t/disabled.def
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ rpl_ndb_set_null : bug #51100
rpl_ndb_ddl : BUG 14785681 RPL_DDL.TEST NEVER RUN
# The below two tests runs extra/rpl_tests/rpl_mixed_implicit_commit_binlog
# which is maintained upstream and easily breaks due to the inherent
# difference in binlog ouput depending on who's creating the binlog.
# difference in binlog output depending on who's creating the binlog.
# These tests should be merged and made much more stable by not having
# to hardcode "magic" numbers into the test. Test should also be fixed
# to switch binlog_format itself if that is necessary for the test to properly
Expand Down
4 changes: 2 additions & 2 deletions mysys/mf_dirname.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ char *convert_dirname(char *to, const char *from, const char *from_end)
#endif
DBUG_ENTER("convert_dirname");

/* We use -2 here, becasue we need place for the last FN_LIBCHAR */
/* We use -2 here, because we need place for the last FN_LIBCHAR */
if (!from_end || (from_end - from) > FN_REFLEN-2)
from_end=from+FN_REFLEN -2;

Expand Down Expand Up @@ -141,7 +141,7 @@ char *convert_dirname(char *to, const char *from, const char *from_end)
*to=0;
}
#else
/* This is ok even if to == from, becasue we need to cut the string */
/* This is ok even if to == from, because we need to cut the string */
to= strmake(to, from, (size_t) (from_end-from));
#endif

Expand Down
2 changes: 1 addition & 1 deletion mysys/mf_iocache.c
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ init_functions(IO_CACHE* info)
If == 0 then use my_default_record_cache_size
type Type of cache
seek_offset Where cache should start reading/writing
use_async_io Set to 1 of we should use async_io (if avaiable)
use_async_io Set to 1 of we should use async_io (if available)
cache_myflags Bitmap of different flags
MY_WME | MY_FAE | MY_NABP | MY_FNABP |
MY_DONT_CHECK_FILESIZE
Expand Down
2 changes: 1 addition & 1 deletion mysys/my_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
max_file_limit Files to open

NOTES
The request may not fulfilled becasue of system limitations
The request may not fulfilled because of system limitations

RETURN
Files available to open.
Expand Down
4 changes: 2 additions & 2 deletions mysys_ssl/my_default.cc
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ C_MODE_END
check the pointer, use "----args-separator----" here to ease debug
if someone misused it.

The args seprator will only be added when
my_getopt_use_args_seprator is set to TRUE before calling
The args separator will only be added when
my_getopt_use_args_separator is set to TRUE before calling
load_defaults();

See BUG#25192
Expand Down
2 changes: 1 addition & 1 deletion mysys_ssl/my_getopt.cc
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ int my_handle_options(int *argc, char ***argv,
{
is_cmdline_arg= 1;

/* save the separator too if skip unkown options */
/* save the separator too if skip unknown options */
if (my_getopt_skip_unknown)
(*argv)[argvpos++]= cur_arg;
else
Expand Down
2 changes: 1 addition & 1 deletion plugin/innodb_memcached/daemon_memcached/doc/protocol.txt
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ settings, documented below. In the other form it has some arguments:
stats <args>\r\n

Depending on <args>, various internal data is sent by the server. The
kinds of arguments and the data sent are not documented in this vesion
kinds of arguments and the data sent are not documented in this version
of the protocol, and are subject to change for the convenience of
memcache developers.

Expand Down
Loading