Commit Graph

998 Commits

Author SHA1 Message Date
fec9aa006f mvcc: compact implementation
backup
2015-10-13 20:58:01 +08:00
0c376d371c Merge pull request #366 from Alienero/master
tidb-server/server : fixed mysql init handshake
2015-10-13 15:26:41 +08:00
Yim
c0cd6b21f4 user 0x15 filler. 2015-10-13 15:23:49 +08:00
d2fa055294 Merge pull request #372 from pingcap/qiuyesuifeng/tiny-clean-up
Makefile bug fixed and clean up.
2015-10-13 14:45:34 +08:00
dfd8cbcffc Merge branch 'master' into qiuyesuifeng/tiny-clean-up 2015-10-13 14:31:04 +08:00
5377b8dd0d *: tiny clean up. 2015-10-13 14:23:33 +08:00
e35d415d4a Merge pull request #359 from pingcap/c4pt0r/mvcc-better-iteration
improve MVCC iterator performance
2015-10-13 11:06:34 +08:00
16d0c20fa6 util: add some comments
address review comment
2015-10-13 11:00:32 +08:00
eab269c85b Merge pull request #370 from pingcap/shenli/parser-cleanup
parser: Tiny cleanup
2015-10-13 10:54:13 +08:00
33016df971 Merge pull request #360 from pingcap/siddontang/like-escape
support like escape
2015-10-13 10:47:57 +08:00
343ffede79 parser: Tiny cleanup 2015-10-13 10:45:24 +08:00
8fec2e463d Merge pull request #350 from pingcap/sheni/issue-320
*: SubSelect can be used as select statement
2015-10-13 10:33:37 +08:00
522aa0c85a tidb: Address comment 2015-10-13 10:29:56 +08:00
f004aec6ff Merge pull request #367 from pingcap/siddontang/fix-index-fields
plans: join filter must use origin result fields
2015-10-13 10:24:59 +08:00
1c34bcb5cc tidb: add test. 2015-10-13 10:21:04 +08:00
213b0b9ab8 parser: Address comment 2015-10-13 10:12:04 +08:00
647997a7e5 plans: join filter must use origin result fields
Fix #363
e,g, `select * from t as a`
The plan phase in from is table plan -> join plan, and we can only get
the alias name in join plan, so if we return origin table plan directly
in join Filter, we may get wrong result fields.
2015-10-13 10:04:49 +08:00
b64f0cdbaa Merge pull request #362 from pingcap/shenli/check-parser-conflict
tidb: Check parser S/R conflict in Makefile
2015-10-13 09:24:58 +08:00
Yim
2b8286a210 Update conn.go
not enable CLIENT_PLUGIN_AUTH(https://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Protocol::Handshake),
0x00 is filler.
2015-10-13 02:22:49 +08:00
41beb10280 Merge pull request #361 from pingcap/shenli/parser-cleanup
parser: Change Factor1 to a meaningful name
2015-10-12 22:25:15 +08:00
c389330109 tidb: Address comment 2015-10-12 22:22:32 +08:00
d594fd83d4 Merge pull request #354 from pingcap/siddontang/update-field-name
update field name
2015-10-12 21:49:22 +08:00
b39cbc304e Merge pull request #352 from pingcap/siddontang/fix-issue-238
rsets: can't have identifier in from dual.
2015-10-12 19:53:53 +08:00
8b4a5f0829 mvcc: address review comments 2015-10-12 18:39:18 +08:00
e8615ec148 tidb: Check parser S/R conflict in MakeFile 2015-10-12 18:07:18 +08:00
1584d8f254 Merge remote-tracking branch 'origin/master' into mvcc-optimize 2015-10-12 17:48:31 +08:00
a9cc7c0321 parser: Change Factor1 to a meaningful name 2015-10-12 17:44:43 +08:00
9e8ce41f33 expression: fix escape string format. 2015-10-12 17:41:11 +08:00
6c9cf0690a parser: add test 2015-10-12 17:37:49 +08:00
001a9f923d *: merge master and fix conflict 2015-10-12 17:36:31 +08:00
442576eda5 mvcc: optimize iterator
use a long-lived iterator instead of creating new iterator when calling
iteratdor.Next()
2015-10-12 17:35:41 +08:00
320dca9fb8 parser: fix S/R conflict. 2015-10-12 17:29:26 +08:00
d030c386eb Merge pull request #348 from pingcap/qiuyesuifeng/tiny-clean-up-packages
Tiny clean up packages.
2015-10-12 16:00:04 +08:00
faad0de363 ddl, kv: address comments. 2015-10-12 15:51:58 +08:00
5c185e807f Merge pull request #358 from fuxiaohei/master
use int64 instead int type, for x86 compilation
2015-10-12 14:10:37 +08:00
8a8be06045 Merge pull request #346 from pingcap/shenli/trim
*: Support trim function
2015-10-12 14:04:18 +08:00
f0a9995e3c Merge pull request #347 from pingcap/shenli/issue-345
stmts: Fix Issue #345
2015-10-12 13:40:30 +08:00
abe94aa2ba parser: Solve merge problem 2015-10-12 13:35:01 +08:00
fud
8f4e2b93de use int64 instead int type,for x32 compilation 2015-10-12 13:33:44 +08:00
5e56f52810 Merge remote-tracking branch 'origin/master' into sheni/issue-320
Conflicts:
	parser/parser_test.go
2015-10-12 13:29:49 +08:00
c621c18c34 stmts: Use matchRows to simplify test case
Address comment
2015-10-12 13:19:22 +08:00
9d06134b7b stmts: Address comment 2015-10-12 13:08:07 +08:00
3c98e2f359 Merge remote-tracking branch 'origin/master' into shenli/trim
Conflicts:
	parser/parser_test.go
2015-10-12 11:43:12 +08:00
7a24ae0b33 Merge pull request #355 from pingcap/shenli/split-parser-test
parser: Split parser test cases
2015-10-12 11:21:54 +08:00
dc5e31c754 parser: Address comment 2015-10-12 11:18:09 +08:00
13051f54f5 parser: Address commment 2015-10-12 11:07:34 +08:00
1661b650fa parser: Split parser test cases
Avoid pr conflict
2015-10-12 10:59:04 +08:00
742f8ff3b7 parser: remove unnecessary code. 2015-10-12 10:17:11 +08:00
903e2e52a5 Merge pull request #351 from pingcap/shenli/issue-312
*: Check float length in parser
2015-10-12 10:12:48 +08:00
df24051cbf *: Merge branch 'master' into siddontang/update-field-name 2015-10-12 10:09:09 +08:00