Commit Graph

8026 Commits

Author SHA1 Message Date
ac76b071b3 evalutator: change the shadowed err
Change the shadowed err to err1.
2016-03-16 15:58:30 +08:00
953c66499a optimizer: fix a bug in optimizeJoinOrder
Fix a bug in optimizeJoinOrder.
2016-03-16 15:43:26 +08:00
864c978130 Merge pull request #973 from pingcap/zxylvlp/change-datum-in-ast
evaluator: change math and time parma from interface to datum
2016-03-16 13:55:41 +08:00
47cb1d6626 evaluator: change math and time parma interface to datum
Change math and time parma interface to datum.
2016-03-16 13:03:54 +08:00
b64008ef5e Merge pull request #978 from pingcap/shenli/dup-foreign-key
*: Ignore foreign key when check index name duplication
2016-03-16 11:43:36 +08:00
2e13076c4a *: Ignore foreign key when check index name duplication 2016-03-16 11:33:40 +08:00
2ff08488aa Merge pull request #977 from pingcap/shenli/fix-974
*: Support more create table options
2016-03-16 11:07:35 +08:00
7f57652532 *: Support more create table options
The options are parsed but ignored.
Fix: https://github.com/pingcap/tidb/issues/975
Fix: https://github.com/pingcap/tidb/issues/974
2016-03-16 10:41:42 +08:00
d9644b3294 Merge pull request #976 from pingcap/zxylvlp/optimizer-fix-bug
optimizer: fix a bug in newInnerJoinPath
2016-03-16 10:35:01 +08:00
8c217762c0 optimizer: fix a bug in newInnerJoinPath
Fix a bug in newInnerJoinPath.
2016-03-16 10:26:19 +08:00
0fb4f306dc Merge pull request #972 from pingcap/shenli/fix-comment
parser: Handle MySQL-specific code
2016-03-15 16:08:59 +08:00
5fd70ed31e parser: Handle MySQL-specific code
Fix: https://github.com/pingcap/tidb/issues/971
2016-03-15 15:53:39 +08:00
b2f5a62040 Merge pull request #968 from pingcap/zxylvlp/change-datum-in-ast
evaluator: change Get/SetValue to Get/SetDatum.
2016-03-12 21:44:42 +08:00
65fd9a77c6 Change bool to int64. 2016-03-11 20:27:01 +08:00
b8547f5734 Merge branch 'master' into zxylvlp/change-datum-in-ast 2016-03-11 20:05:52 +08:00
0fa8df585a evaluator: change SetDatum and implement ToBool, ToInt
Change SetDatum and implement ToBool, ToInt.
2016-03-11 19:58:40 +08:00
89294597b2 Merge pull request #969 from pingcap/zimuxia/fix-explain-select
tidb-server: Fix the table field is null in the ResultField structure.
2016-03-11 17:43:27 +08:00
xia
6beacc6795 tidb-server: fix the table field is null in the ResultField structure. 2016-03-11 14:48:37 +08:00
5a81a2f5d4 evaluator: change Get/SetValue to Get/SetDatum.
Chnage Get/SetValue to Get/SetDatum in evaluator.go .
2016-03-11 13:37:58 +08:00
a0d9292310 Merge pull request #966 from pingcap/zxylvlp/move-ast-functions-to-buildin
evaluator: move the evaluate of ast function date_add and date_sub to…
2016-03-11 09:49:06 +08:00
352c27829a evaluator: move date_add and date_sub to buildin
Move the evaluate of ast function date_add and date_sub to builtin.
2016-03-10 19:04:33 +08:00
6b154fd7a8 Merge pull request #965 from pingcap/zimuxia/issue959
*: Fix issue#959
2016-03-10 18:05:47 +08:00
6feff794a3 *: address comments 2016-03-10 16:29:36 +08:00
ce531c7f0d executor: fix issue959 and add tests 2016-03-10 15:13:18 +08:00
cd0a3dbe03 *: add Rebase interface and add tests 2016-03-10 15:13:18 +08:00
0f17f0c66b Merge pull request #964 from pingcap/zxylvlp/move-buildin-files-to-evaluator
evaluator: move the files in buildin package to evaluator package
2016-03-10 10:36:04 +08:00
79962174ef evaluator: move the files in buildin package to evaluator package
Move the files in buildin package to evaluator package.
2016-03-10 10:03:47 +08:00
7250f055cd Merge pull request #960 from pingcap/zxylvlp/move-ast-functions-to-buildin
evaluator: move the evaluate of ast function trim to buildin
2016-03-09 18:23:13 +08:00
f4bf763d27 evaluator: move the evaluate of ast function trim to buildin
Move the evaluate of ast function trim to builtin.
2016-03-09 18:06:16 +08:00
ad031ef318 Merge pull request #957 from pingcap/zimuxia/issue-827
*: Fix issue #827
2016-03-09 17:01:57 +08:00
xia
8729b45bb6 *: add tests 2016-03-09 16:52:52 +08:00
xia
c3e3a7c580 *: fix issue 827 2016-03-08 18:07:44 +08:00
9f39a90227 Merge pull request #955 from pingcap/zxylvlp/move-ast-functions-to-buildin
evaluator: move the evaluate of ast function substring_index and locate to buildin
2016-03-08 17:48:08 +08:00
3fbcb85bb3 Merge remote-tracking branch 'origin/master' into zxylvlp/move-ast-functions-to-buildin 2016-03-08 17:34:18 +08:00
02ccdc363a evaluator: move the evaluate of ast function substring_index and locate to buildin
Move the evaluate of ast function substring_index and locate to buildin.
And Change some logic in locate function to make its behavior more similar with MySQL.
2016-03-08 17:30:43 +08:00
e2b5c1829c Merge pull request #958 from c-wind/master
ddl: fixed test  bug
2016-03-08 16:53:41 +08:00
7ec14d6643 Merge pull request #956 from pingcap/shenli/fix-386
types: Fix i386 float to uint error
2016-03-08 16:24:17 +08:00
f1db0e42ef types: Fix i386 float to uint error
uint64(float64(-1)) will be 0. So we cast float64 to int64 first.
2016-03-08 15:53:50 +08:00
06c3b3178d Merge pull request #954 from pingcap/zxylvlp/move-ast-functions-to-buildin
evaluator: move the evaluate of ast functions to buildin
2016-03-08 10:58:29 +08:00
afd369e042 evaluator: move the evaluate of ast functions to buildin
Move the evaluate of ast functions extract, convert and substring to buildin.
2016-03-08 10:50:14 +08:00
eff9f1d32b Merge pull request #953 from pingcap/shenli/fix-sqllogic
*: Add Coerce before compare for PatternInExpr
2016-03-07 14:49:43 +08:00
a9d0039573 *: Add Coerce before compare for PatternInExpr
Fix sqllogic test
2016-03-07 14:34:55 +08:00
9cd548dfda Merge pull request #952 from pingcap/coocood/datum-convert
*: replace interface{} with Datum in convert.
2016-03-07 14:31:39 +08:00
ac12b71714 *: replace interface{} with Datum in convert. 2016-03-07 14:11:17 +08:00
085d94c7b1 Merge pull request #951 from pingcap/shenli/rm-coldef
*: Remove coldef package
2016-03-05 19:27:50 +08:00
515f193bd2 *: Remove coldef package
There are lots of redundancies between ast and coldef. So we remove
coldef.
2016-03-05 19:11:04 +08:00
0fed9dbc5e ddl: fixed test bug 2016-03-05 11:30:06 +08:00
6ca8d34af9 Merge pull request #950 from pingcap/coocood/fix-compare-datum
util/types: fix compare datum.
2016-03-04 14:45:27 +08:00
11942ab3a1 util/types: fix compare datum. 2016-03-04 14:35:35 +08:00
c6c65e52d7 Merge pull request #949 from c-wind/master
ddl:Delete the useless judgment
2016-03-04 14:33:36 +08:00