Merge branch 'master' of https://github.com/pingcap/parser into admin…

…_reload
pingcap · Jun 12, 2019 · b2b647f · b2b647f
2 parents c4f310a + 939965d
commit b2b647f
Show file tree

Hide file tree

Showing 11 changed files with 7,960 additions and 7,027 deletions.
diff --git a/ast/ddl.go b/ast/ddl.go
diff --git a/ast/expressions_test.go b/ast/expressions_test.go
@@ -330,7 +330,7 @@ func (tc *testExpressionsSuite) TestMaxValueExprRestore(c *C) {
 		{"maxvalue", "MAXVALUE"},
 	}
 	extractNodeFunc := func(node Node) Node {
-		return node.(*AlterTableStmt).Specs[0].PartDefinitions[0].LessThan[0]
+		return node.(*AlterTableStmt).Specs[0].PartDefinitions[0].Clause.(*PartitionDefinitionClauseLessThan).Exprs[0]
 	}
 	RunNodeRestoreTest(c, testCases, "alter table posts add partition ( partition p1 values less than %s)", extractNodeFunc)
 }

diff --git a/misc.go b/misc.go
@@ -234,6 +234,7 @@ var tokenMap = map[string]int{
 	"DELETE":                   deleteKwd,
 	"DESC":                     desc,
 	"DESCRIBE":                 describe,
+	"DIRECTORY":                directory,
 	"DISABLE":                  disable,
 	"DISTINCT":                 distinct,
 	"DISTINCTROW":              distinct,
@@ -289,6 +290,7 @@ var tokenMap = map[string]int{
 	"HASH":                     hash,
 	"HAVING":                   having,
 	"HIGH_PRIORITY":            highPriority,
+	"HISTORY":                  history,
 	"HOUR":                     hour,
 	"HOUR_MICROSECOND":         hourMicrosecond,
 	"HOUR_MINUTE":              hourMinute,
@@ -338,6 +340,7 @@ var tokenMap = map[string]int{
 	"LIMIT":                    limit,
 	"LINES":                    lines,
 	"LINEAR":                   linear,
+	"LIST":                     list,
 	"LOAD":                     load,
 	"LOCAL":                    local,
 	"LOCALTIME":                localTime,
@@ -380,6 +383,7 @@ var tokenMap = map[string]int{
 	"NO_WRITE_TO_BINLOG":       noWriteToBinLog,
 	"NODE_ID":                  nodeID,
 	"NODE_STATE":               nodeState,
+	"NODEGROUP":                nodegroup,
 	"NONE":                     none,
 	"NOT":                      not,
 	"NOW":                      now,
@@ -489,6 +493,7 @@ var tokenMap = map[string]int{
 	"STATUS":                   status,
 	"SWAPS":                    swaps,
 	"SWITCHES":                 switchesSym,
+	"SYSTEM_TIME":              systemTime,
 	"OPEN":                     open,
 	"STD":                      stddevPop,
 	"STDDEV":                   stddevPop,

diff --git a/model/flags.go b/model/flags.go
@@ -40,4 +40,6 @@ const (
 	FlagIgnoreZeroInDate = 1 << 7
 	// FlagDividedByZeroAsWarning indicates if DividedByZero should be returned as warning.
 	FlagDividedByZeroAsWarning = 1 << 8
+	// FlagInUnionStmt indicates if this is a UNION statement.
+	FlagInUnionStmt = 1 << 9
 )
diff --git a/model/model.go b/model/model.go
@@ -545,9 +545,11 @@ type PartitionType int
 
 // Partition types.
 const (
-	PartitionTypeRange PartitionType = 1
-	PartitionTypeHash  PartitionType = 2
-	PartitionTypeList  PartitionType = 3
+	PartitionTypeRange      PartitionType = 1
+	PartitionTypeHash                     = 2
+	PartitionTypeList                     = 3
+	PartitionTypeKey                      = 4
+	PartitionTypeSystemTime               = 5
 )
 
 func (p PartitionType) String() string {
@@ -558,6 +560,10 @@ func (p PartitionType) String() string {
 		return "HASH"
 	case PartitionTypeList:
 		return "LIST"
+	case PartitionTypeKey:
+		return "KEY"
+	case PartitionTypeSystemTime:
+		return "SYSTEM_TIME"
 	default:
 		return ""
 	}

diff --git a/mysql/errcode.go b/mysql/errcode.go
@@ -921,6 +921,11 @@ const (
 	ErrWindowExplainJson                                            = 3598
 	ErrWindowFunctionIgnoresFrame                                   = 3599
 
+	// MariaDB errors.
+	ErrOnlyOneDefaultPartionAllowed         = 4030
+	ErrWrongPartitionTypeExpectedSystemTime = 4113
+	ErrSystemVersioningWrongPartitions      = 4128
+
 	// TiDB self-defined errors.
 	ErrMemExceedThreshold         = 8001
 	ErrForUpdateCantRetry         = 8002

diff --git a/mysql/errname.go b/mysql/errname.go
@@ -917,6 +917,11 @@ var MySQLErrName = map[uint16]string{
 	ErrRoleNotGranted:                                        "%s is is not granted to %s",
 	ErrMaxExecTimeExceeded:                                   "Query execution was interrupted, max_execution_time exceeded.",
 
+	// MariaDB errors.
+	ErrOnlyOneDefaultPartionAllowed:         "Only one DEFAULT partition allowed",
+	ErrWrongPartitionTypeExpectedSystemTime: "Wrong partitioning type, expected type: `SYSTEM_TIME`",
+	ErrSystemVersioningWrongPartitions:      "Wrong Partitions: must have at least one HISTORY and exactly one last CURRENT",
+
 	// TiDB errors.
 	ErrMemExceedThreshold:         "%s holds %dB memory, exceeds threshold %dB.%s",
 	ErrForUpdateCantRetry:         "[%d] can not retry select for update statement",