Merge branch 'master' into selectivity

pingcap · Nov 5, 2018 · 80819b8 · 80819b8
2 parents 37dbb1f + 8e5f4b1
commit 80819b8
Show file tree

Hide file tree

Showing 1,369 changed files with 4,579 additions and 600,336 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,4 @@
 bin
-/interpreter/interpreter
-/interpreter/test
-/parser/parser.go
 /tidb-server/tidb-server
 /tidb-server/debug
 coverage.out

diff --git a/.travis.yml b/.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
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ language: go @@
     go_import_path: github.com/pingcap/tidb
     go:
-      - "1.11"
+      - "1.11.x"
     env:
         - TRAVIS_COVERAGE=0
@@ Expand Down @@