Merge branch 'master' into constant-propagate

.gitignore

@@ -1,7 +1,4 @@
 bin
-/interpreter/interpreter
-/interpreter/test
-/parser/parser.go
 /tidb-server/tidb-server
 /tidb-server/debug
 coverage.out
@@ -15,5 +12,6 @@ y.output
 profile.coverprofile
 explain_test
 cmd/explaintest/explain-test.out
+cmd/explaintest/explaintest_tidb-server
 _tools/
 *.fail.go

.travis.yml

@@ -3,7 +3,7 @@ language: go
 go_import_path: github.com/pingcap/tidb
 
 go:
-  - "1.11"
+  - "1.11.x"
 
 env:
     - TRAVIS_COVERAGE=0

CHANGELOG.md

@@ -1,6 +1,69 @@
 # TiDB Changelog
 All notable changes to this project will be documented in this file. See also [Release Notes](https://github.com/pingcap/docs/blob/master/releases/rn.md), [TiKV Changelog](https://github.com/tikv/tikv/blob/master/CHANGELOG.md) and [PD Changelog](https://github.com/pingcap/pd/blob/master/CHANGELOG.md).
 
+## [2.1.0-rc.5] - 2018-11-12
+### SQL Optimizer
+* Fix the issue that `IndexReader` reads the wrong handle in some cases [#8132](https://github.com/pingcap/tidb/pull/8132)
+* Fix the issue occurred while the `IndexScan Prepared` statement uses `Plan Cache` [#8055](https://github.com/pingcap/tidb/pull/8055)
+* Fix the issue that the result of the `Union` statement is unstable [#8165](https://github.com/pingcap/tidb/pull/8165)
+### SQL Execution Engine
+* Improve the performance of TiDB on inserting or updating wide tables [#8024](https://github.com/pingcap/tidb/pull/8024)
+* Support the unsigned `int` flag in the `Truncate` built-in function [#8068](https://github.com/pingcap/tidb/pull/8068)
+* Fix the error occurred while converting JSON data to the decimal type [#8109](https://github.com/pingcap/tidb/pull/8109)
+* Fix the error occurred when you `Update` the float type [#8170](https://github.com/pingcap/tidb/pull/8170)
+### Statistics
+* Fix the incorrect statistics issue during point queries in some cases [#8035](https://github.com/pingcap/tidb/pull/8035)
+* Fix the selectivity estimation of statistics for primary key in some cases [#8149](https://github.com/pingcap/tidb/pull/8149)
+* Fix the issue that the statistics of deleted tables are not cleared up for a long period of time [#8182](https://github.com/pingcap/tidb/pull/8182)
+### Server
+* Improve the readability of logs and make logs better
+    - [#8063](https://github.com/pingcap/tidb/pull/8063)
+    - [#8053](https://github.com/pingcap/tidb/pull/8053)
+    - [#8224](https://github.com/pingcap/tidb/pull/8224)
+* Fix the error occurred when obtaining the table data of `infoschema.profiling` [#8096](https://github.com/pingcap/tidb/pull/8096)
+* Replace the unix socket with the pumps client to write binlogs [#8098](https://github.com/pingcap/tidb/pull/8098)
+* Add the threshold value for the `tidb_slow_log_threshold` environment variable, which dynamically sets the slow log [#8094](https://github.com/pingcap/tidb/pull/8094)
+* Add the original length of a SQL statement truncated while the `tidb_query_log_max_len` environment variable dynamically sets logs [8200](https://github.com/pingcap/tidb/pull/8200)
+* Add the `tidb_opt_write_row_id` environment variable to control whether to allow writing `_tidb_rowid` [#8218](https://github.com/pingcap/tidb/pull/8218)
+* Add an upper bound to the `Scan` command of ticlient, to avoid overbound scan [#8081](https://github.com/pingcap/tidb/pull/8081), [#8247](https://github.com/pingcap/tidb/pull/8247)    
+### DDL
+* Fix the issue that executing DDL statements in transactions encounters an error in some cases [#8056](https://github.com/pingcap/tidb/pull/8056)
+* Fix the issue that executing `truncate table` in partition tables does not take effect [#8103](https://github.com/pingcap/tidb/pull/8103)
+* Fix the issue that the DDL operation does not roll back correctly after being cancelled in some cases [#8057](https://github.com/pingcap/tidb/pull/8057) 
+* Add the `admin show next_row_id` command to return the next available row ID [#8268](https://github.com/pingcap/tidb/pull/8268)  
+
+
+## [2.1.0-rc.4] - 2018-10-23
+### SQL Optimizer
+* Fix the issue that column pruning of `UnionAll` is incorrect in some cases [#7941](https://github.com/pingcap/tidb/pull/7941)
+* Fix the issue that the result of the `UnionAll` operator is incorrect in some cases [#8007](https://github.com/pingcap/tidb/pull/8007)
+### SQL Execution Engine
+* Fix the precision issue of the `AVG` function [#7874](https://github.com/pingcap/tidb/pull/7874)
+* Support using the `EXPLAIN ANALYZE` statement to check the runtime statistics including the execution time and the number of returned rows of each operator during the query execution process [#7925](https://github.com/pingcap/tidb/pull/7925)
+* Fix the panic issue of the `PointGet` operator when a column of a table appears multiple times in the result set [#7943](https://github.com/pingcap/tidb/pull/7943)
+* Fix the panic issue caused by too large values in the `Limit` subclause [#8002](https://github.com/pingcap/tidb/pull/8002)
+* Fix the panic issue during the execution process of the `AddDate`/`SubDate` statement in some cases [#8009](https://github.com/pingcap/tidb/pull/8009)
+### Statistics
+* Fix the issue of judging the prefix of the histogram low-bound of the combined index as out of range [#7856](https://github.com/pingcap/tidb/pull/7856)
+* Fix the memory leak issue caused by statistics collecting [#7873](https://github.com/pingcap/tidb/pull/7873)
+* Fix the panic issue when the histogram is empty [#7928](https://github.com/pingcap/tidb/pull/7928)
+* Fix the issue that the histogram bound is out of range when the statistics is being uploaded [#7944](https://github.com/pingcap/tidb/pull/7944)
+* Limit the maximum length of values in the statistics sampling process [#7982](https://github.com/pingcap/tidb/pull/7982)
+### Server
+* Refactor Latch to avoid misjudgment of transaction conflicts and improve the execution performance of concurrent transactions [#7711](https://github.com/pingcap/tidb/pull/7711)
+* Fix the panic issue caused by collecting slow queries in some cases [#7874](https://github.com/pingcap/tidb/pull/7847)
+* Fix the panic issue when `ESCAPED BY` is an empty string in the `LOAD DATA` statement [#8005](https://github.com/pingcap/tidb/pull/8005)
+* Complete the “coprocessor error” log information [#8006](https://github.com/pingcap/tidb/pull/8006)
+### Compatibility
+* Set the `Command` field of the `SHOW PROCESSLIST` result to `Sleep` when the query is empty [#7839](https://github.com/pingcap/tidb/pull/7839)
+### Expressions
+* Fix the constant folding issue of the `SYSDATE` function [#7895](https://github.com/pingcap/tidb/pull/7895)
+* Fix the issue that `SUBSTRING_INDEX` panics in some cases [#7897](https://github.com/pingcap/tidb/pull/7897)
+### DDL
+* Fix the stack overflow issue caused by throwing the `invalid ddl job type` error [#7958](https://github.com/pingcap/tidb/pull/7958)
+* Fix the issue that the result of `ADMIN CHECK TABLE` is incorrect in some cases [#7975](https://github.com/pingcap/tidb/pull/7975)
+
+
 ## [2.1.0-rc.2] - 2018-09-14
 ### SQL Optimizer
 * Put forward a proposal of the next generation Planner [#7543](https://github.com/pingcap/tidb/pull/7543)
@@ -15,7 +78,7 @@ All notable changes to this project will be documented in this file. See also [R
 * Optimize the performance of Hash aggregate operators [#7541](https://github.com/pingcap/tidb/pull/7541)
 * Optimize the performance of Join operators [#7493](https://github.com/pingcap/tidb/pull/7493), [#7433](https://github.com/pingcap/tidb/pull/7433)
 * Fix the issue that the result of `UPDATE JOIN` is incorrect when the Join order is changed [#7571](https://github.com/pingcap/tidb/pull/7571)
-* Improve the performance of Chunk’s iterator [#7585](https://github.com/pingcap/tidb/pull/7585) 
+* Improve the performance of Chunk’s iterator [#7585](https://github.com/pingcap/tidb/pull/7585)
 ### Statistics
 * Fix the issue that the auto Analyze work repeatedly analyzes the statistics [#7550](https://github.com/pingcap/tidb/pull/7550)
 * Fix the statistics update error that occurs when there is no statistics change [#7530](https://github.com/pingcap/tidb/pull/7530)

CONTRIBUTING.md

@@ -61,7 +61,7 @@ TiDB is written in [Go](http://golang.org).
 If you don't have a Go development environment,
 please [set one up](http://golang.org/doc/code.html).
 
-The version of GO should be **1.10** or above.
+The version of GO should be **1.11** or above.
 
 After installation, you'll need `GOPATH` defined,
 and `PATH` modified to access your Go binaries.
@@ -75,11 +75,7 @@ export PATH=$PATH:$GOPATH/bin
 
 #### Dependency management
 
-TiDB uses [`dep`](https://github.com/golang/dep) to manage dependencies.
-
-```sh
-go get -u github.com/golang/dep/cmd/dep
-```
+TiDB uses [`Go Modules`](https://github.com/golang/go/wiki/Modules) to manage dependencies.
 
 ## Workflow
 

Dockerfile

@@ -1,10 +1,14 @@
 # Builder image
-FROM golang:1.10.1-alpine as builder
+FROM golang:1.11.2-alpine as builder
 
 RUN apk add --no-cache \
+    wget \
     make \
     git
 
+RUN wget -O /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_amd64 \
+ && chmod +x /usr/local/bin/dumb-init
+
 COPY . /go/src/github.com/pingcap/tidb
 
 WORKDIR /go/src/github.com/pingcap/tidb/
@@ -15,10 +19,13 @@ RUN make
 FROM scratch
 
 COPY --from=builder /go/src/github.com/pingcap/tidb/bin/tidb-server /tidb-server
+COPY --from=builder /usr/local/bin/dumb-init /usr/local/bin/dumb-init
+
+
 
 WORKDIR /
 
 EXPOSE 4000
 
-ENTRYPOINT ["/tidb-server"]
+ENTRYPOINT ["/usr/local/bin/dumb-init", "/tidb-server"]