Fix typos (pingcap#1714)

evaluator/builtin_other.go

@@ -298,7 +298,7 @@ func compareFuncFactory(op opcode.Op) BuiltinFunc {
 		case opcode.NE:
 			result = n != 0
 		default:
-			return d, ErrInvalidOperation.Gen("invalid op %v in comparision operation", op)
+			return d, ErrInvalidOperation.Gen("invalid op %v in comparison operation", op)
 		}
 		if result {
 			d.SetInt64(oneI64)

evaluator/evaluator_binop.go

@@ -50,7 +50,7 @@ func (e *Evaluator) handleLogicOperation(o *ast.BinaryOperationExpr) bool {
 	case opcode.LogicXor:
 		return e.handleXor(o)
 	default:
-		e.err = ErrInvalidOperation.Gen("unkown operator %s", o.Op)
+		e.err = ErrInvalidOperation.Gen("unknown operator %s", o.Op)
 		return false
 	}
 }
@@ -207,7 +207,7 @@ func getCompResult(op opcode.Op, value int) (bool, error) {
 	case opcode.NullEQ:
 		return value == 0, nil
 	default:
-		return false, ErrInvalidOperation.Gen("invalid op %v in comparision operation", op)
+		return false, ErrInvalidOperation.Gen("invalid op %v in comparison operation", op)
 	}
 }
 

executor/prepared.go

@@ -239,7 +239,7 @@ func (e *ExecuteExec) Build() error {
 		// if this time it failed, the real reason for the error is schema changed.
 		err := plan.PrepareStmt(e.IS, e.Ctx, prepared.Stmt)
 		if err != nil {
-			return ErrSchemaChanged.Gen("Schema change casued error: %s", err.Error())
+			return ErrSchemaChanged.Gen("Schema change caused error: %s", err.Error())
 		}
 		prepared.SchemaVersion = e.IS.SchemaMetaVersion()
 	}

infoschema/tables.go

@@ -129,7 +129,7 @@ var columnsCols = []columnInfo{
 	{"IS_NULLABLE", mysql.TypeVarchar, 3, 0, nil, nil},
 	{"DATA_TYPE", mysql.TypeVarchar, 64, 0, nil, nil},
 	{"CHARACTER_MAXIMUM_LENGTH", mysql.TypeLonglong, 21, 0, nil, nil},
-	{"CHARACTOR_OCTET_LENGTH", mysql.TypeLonglong, 21, 0, nil, nil},
+	{"CHARACTER_OCTET_LENGTH", mysql.TypeLonglong, 21, 0, nil, nil},
 	{"NUMERIC_PRECISION", mysql.TypeLonglong, 21, 0, nil, nil},
 	{"NUMERIC_SCALE", mysql.TypeLonglong, 21, 0, nil, nil},
 	{"DATETIME_PRECISION", mysql.TypeLonglong, 21, 0, nil, nil},
@@ -391,7 +391,7 @@ func dataForColumnsInTable(schema *model.DBInfo, tbl *model.TableInfo) [][]types
 			columnDesc.Null,                      // IS_NULLABLE
 			types.TypeToStr(col.Tp, col.Charset), // DATA_TYPE
 			colLen,                            // CHARACTER_MAXIMUM_LENGTH
-			colLen,                            // CHARACTOR_OCTET_LENGTH
+			colLen,                            // CHARACTER_OCTET_LENGTH
 			decimal,                           // NUMERIC_PRECISION
 			0,                                 // NUMERIC_SCALE
 			0,                                 // DATETIME_PRECISION

mysql/errname.go

@@ -605,7 +605,7 @@ var MySQLErrName = map[uint16]string{
 	ErrBinlogPurgeEmFile:                        "Too many files opened, please execute the command again",
 	ErrEventCannotCreateInThePast:               "Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.",
 	ErrEventCannotAlterInThePast:                "Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was not changed. Specify a time in the future.",
-	ErrSlaveIncident:                            "The incident %s occured on the master. Message: %-.64s",
+	ErrSlaveIncident:                            "The incident %s occurred on the master. Message: %-.64s",
 	ErrNoPartitionForGivenValueSilent:           "Table has no partition for some existing values",
 	ErrBinlogUnsafeStatement:                    "Unsafe statement written to the binary log using statement format since BINLOGFORMAT = STATEMENT. %s",
 	ErrSlaveFatal:                               "Fatal : %s",

mysql/mydecimal.go

@@ -72,7 +72,7 @@ func add(a, b, carry int32) (int32, int32) {
 	return sum, carry
 }
 
-// sub substracts b and carry from a, returns the diff and new carry.
+// sub subtracts b and carry from a, returns the diff and new carry.
 func sub(a, b, carry int32) (int32, int32) {
 	diff := a - b - carry
 	if diff < 0 {
@@ -84,7 +84,7 @@ func sub(a, b, carry int32) (int32, int32) {
 	return diff, carry
 }
 
-// sub2 substracts b and carry from a, returns the diff and new carry.
+// sub2 subtracts b and carry from a, returns the diff and new carry.
 // the new carry may be 2.
 func sub2(a, b, carry int32) (int32, int32) {
 	diff := a - b - carry
@@ -575,15 +575,15 @@ func (d *MyDecimal) digitBounds() (start, end int) {
 	bufLen := digitsToWords(int(d.digitsInt)) + digitsToWords(int(d.digitsFrac))
 	bufEnd := bufLen - 1
 
-	/* find non-zero digit from number begining */
+	/* find non-zero digit from number beginning */
 	for bufBeg < bufLen && d.wordBuf[bufBeg] == 0 {
 		bufBeg++
 	}
 	if bufBeg >= bufLen {
 		return 0, 0
 	}
 
-	/* find non-zero decimal digit from number begining */
+	/* find non-zero decimal digit from number beginning */
 	if bufBeg == 0 && d.digitsInt > 0 {
 		i = (int(d.digitsInt) - 1) % digitsPerWord
 		start = digitsPerWord - i - 1

parser/parser.y

@@ -424,7 +424,7 @@ import (
 	BeginTransactionStmt	"BEGIN TRANSACTION statement"
 	BinlogStmt		"Binlog base64 statement"
 	CastType		"Cast function target type"
-	CharsetName		"Charactor set name"
+	CharsetName		"Character set name"
 	ColumnDef		"table column definition"
 	ColumnName		"column name"
 	ColumnNameList		"column name list"

parser/parser_test.go

@@ -775,7 +775,7 @@ func (s *testParserSuite) TestDDL(c *C) {
 		{"create schema xxx", true},
 		{"create schema if exists xxx", false},
 		{"create schema if not exists xxx", true},
-		// For drop datbase/schema/table
+		// For drop database/schema/table
 		{"drop database xxx", true},
 		{"drop database if exists xxx", true},
 		{"drop database if not exists xxx", false},

plan/resolver.go

@@ -582,7 +582,7 @@ func (nr *nameResolver) resolveColumnNameInOnCondition(cn *ast.ColumnNameExpr) {
 	join := ctx.joinNodeStack[len(ctx.joinNodeStack)-1]
 	tableSources := appendTableSources(nil, join)
 	if !nr.resolveColumnInTableSources(cn, tableSources) {
-		nr.Err = errors.Errorf("unkown column name %s", cn.Name.Name.O)
+		nr.Err = errors.Errorf("unknown column name %s", cn.Name.Name.O)
 	}
 }
 

sessionctx/variable/sysvar.go

@@ -592,7 +592,7 @@ var SetNamesVariables = []string{
 const (
 	// CollationConnection is the name for collation_connection system variable.
 	CollationConnection = "collation_connection"
-	// CharsetDatabase is the name for charactor_set_database system variable.
+	// CharsetDatabase is the name for character_set_database system variable.
 	CharsetDatabase = "character_set_database"
 	// CollationDatabase is the name for collation_database system variable.
 	CollationDatabase = "collation_database"

store/localstore/kv.go

@@ -402,7 +402,7 @@ func (s *dbStore) unLockKeys(txn *dbTxn) error {
 	for k := range txn.lockedKeys {
 		if tid, ok := s.keysLocked[k]; !ok || tid != txn.tid {
 			debug.PrintStack()
-			return errors.Errorf("should never happend:%v, %v", tid, txn.tid)
+			return errors.Errorf("should never happened:%v, %v", tid, txn.tid)
 		}
 
 		delete(s.keysLocked, k)

store/tikv/client_test.go

@@ -78,7 +78,7 @@ func closeRequest(conn net.Conn, c *C) {
 	c.Assert(err, IsNil)
 }
 
-// Server close connection directly if new connection is comming.
+// Server close connection directly if new connection is coming.
 func (s *testClientSuite) TestRetryClose(c *C) {
 	l := startServer(":61235", c, closeRequest)
 	defer l.Close()

store/tikv/lock_resolver.go

@@ -87,9 +87,9 @@ func (lr *LockResolver) getResolved(txnID uint64) (txnStatus, bool) {
 
 // ResolveLocks tries to resolve Locks. The resolving process is in 3 steps:
 // 1) Use the `lockTTL` to pick up all expired locks. Only locks that are too
-//    old are considerd orphan locks and will be handled later. If all locks are
-//    expired then all locks will be resolved so the returned `ok` will be true,
-//    otherwise caller should sleep a while before retry.
+//    old are considered orphan locks and will be handled later. If all locks
+//    are expired then all locks will be resolved so the returned `ok` will be
+//    true, otherwise caller should sleep a while before retry.
 // 2) For each lock, query the primary key to get txn(which left the lock)'s
 //    commit status.
 // 3) Send `ResolveLock` cmd to the lock's region to resolve all locks belong to

util/types/convert_test.go

@@ -517,8 +517,8 @@ func (s *testTypeConvertSuite) TestConvert(c *C) {
 
 func (s *testTypeConvertSuite) TestGetValidFloat(c *C) {
 	cases := []struct {
-		orgin string
-		valid string
+		origin string
+		valid  string
 	}{
 		{"-100", "-100"},
 		{"1abc", "1"},
@@ -530,6 +530,6 @@ func (s *testTypeConvertSuite) TestGetValidFloat(c *C) {
 		{"1.1e-13a", "1.1e-13"},
 	}
 	for _, ca := range cases {
-		c.Assert(getValidFloatPrefix(ca.orgin), Equals, ca.valid)
+		c.Assert(getValidFloatPrefix(ca.origin), Equals, ca.valid)
 	}
 }