Commit Graph

70 Commits

Author SHA1 Message Date
62c15881c0 *: Merge branch 'master' into siddontang/dev-schema-change 2015-11-12 15:31:21 +08:00
f49d073b70 Merge pull request #577 from pingcap/shenli/issue-571
fix issue 571
2015-11-12 15:24:56 +08:00
18ce6b604c *: Fix bug in session.Retry()
Miss commit after retry
2015-11-12 15:00:24 +08:00
542bfebd36 *: merge master and fix conflict. 2015-11-12 10:21:50 +08:00
xia
3684664f5d *: use terror instead of error 2015-11-10 20:16:22 +08:00
xia
809f5055b1 *: adjust the show status results and add test 2015-11-10 19:15:08 +08:00
2f334fc652 *: Merge branch 'master' into siddontang/dev-schema-change 2015-11-10 14:36:37 +08:00
xia
61f9e16931 *: rename getGlobalVar to getExecRet and update comments 2015-11-10 13:23:53 +08:00
xia
b1206037b5 *: update comments 2015-11-10 12:16:34 +08:00
xia
415085546b Merge branch 'master' into zimuxia/issue525
Conflicts:
	expression/variable.go
	parser/scanner.l
	plan/plans/show.go
	plan/plans/show_test.go
	stmt/stmts/set.go
2015-11-09 20:22:05 +08:00
xia
f35ec29b6c *: rename GlobalSysVarAccessor to GlobalVarAccessor,
use GetSysVar and GetStatusVar.
2015-11-09 20:02:49 +08:00
xia
5cd36d05f1 *: add GetGlobalStatusVar and SetGlobalStatusVar function,
rename GlobalSysVarAccesssor to GlobalVarAccesssor
2015-11-09 19:41:00 +08:00
7964aff649 *: merge master and fix conflict.
@qiuyesuifeng  we can’t pass test now, should fix the test first.
2015-11-09 13:32:06 +08:00
7d49f39f2e *: Use Bind/Get global sysvar accessor instead of type assertion 2015-11-09 13:02:30 +08:00
1e01c69384 tidb: Clean up log in session.ExecRestrictedSQL 2015-11-06 16:41:21 +08:00
a21673dff3 *: merge master and fix conflict. 2015-11-06 16:33:50 +08:00
120f7a823a tidb: Support SetSchemaLease for test. 2015-11-06 12:11:19 +08:00
0943aa598e terror: unify util/errors and util/errors2 in terror. 2015-11-05 12:05:16 +08:00
9aeb3b27ec *: reset lease time after bootstrap 2015-11-04 19:16:49 +08:00
628922ae35 Merge pull request #439 from pingcap/shenli/string-literal
Shenli/string literal
2015-10-28 14:54:51 +08:00
b39592c02e kv: Do Lock key when create unique index
Fix #461
2015-10-28 13:48:45 +08:00
c059a3b54c Merge pull request #423 from pingcap/shenli/add-priv-step3
Add privilege checker and bind it to session
2015-10-27 15:04:31 +08:00
43de228e84 *: Address comments 2015-10-26 21:46:29 +08:00
2003c6eb4b *: Bind autocommit checker to ctx. 2015-10-26 21:21:37 +08:00
ad0241e5ac *: Address comment 2015-10-26 16:31:07 +08:00
407d99967e *: Refactor some code to support global system variable. 2015-10-26 14:35:06 +08:00
5f2167a5d9 *: Get/Set global sys var from/to kv store. 2015-10-25 22:38:28 +08:00
3c28357b09 *: Pass context to Compile()
Compile should know context to get current charset info.
2015-10-22 17:09:53 +08:00
35f2e98449 *: Refactor privileges
Address comments
2015-10-22 11:31:35 +08:00
a05222a981 tidb: Bind privilege.Checker to ctx. 2015-10-20 17:01:05 +08:00
29369dba8f *: Rename mysqldef to mysql 2015-10-19 16:26:43 +08:00
83fa8f8d4f *: Address comment 2015-10-16 12:26:10 +08:00
48976af41c *: Address comments 2015-10-16 10:04:49 +08:00
67081336f2 tidb: Address comments 2015-10-15 23:07:36 +08:00
a8779d8d52 *: Address comment 2015-10-15 22:50:55 +08:00
207ba2f1f3 *: Add sql helper to make operations on meta table easier. 2015-10-15 17:17:04 +08:00
948fa8bc2b *: Avoid store plaintext password in mysql.user table.
Store hashed password.
2015-10-04 22:31:37 +08:00
be44e4a286 *: Introduce schema version
Make schema change to an atomic operation.
2015-09-24 17:28:34 +08:00
8b264f9427 Modify ddl tests 2015-09-24 17:28:34 +08:00
f9e400d4b3 builtin: Support User() and Current_User() 2015-09-23 11:02:45 +08:00
036796ea9f *: Address comment
log error in session.Auth()
2015-09-22 11:41:23 +08:00
25126e946a *: Address comments
1. Address comments
2. Set ci hosts
2015-09-22 10:30:56 +08:00
59af4ac591 *: Support basic auth for tidb-server
Use password to auth user.
2015-09-22 00:24:43 +08:00
92e40e29b8 *: WIP add Auth interface for Session 2015-09-21 18:31:26 +08:00
e7d2bff9f1 *: Move bootstrap to CreateSession
Bootstrap should be done for both tidb-server and embedded mode.
2015-09-21 15:34:52 +08:00
xia
1bd9a1e740 *: rename SetStatus to SetStatusFlag 2015-09-17 16:47:53 +08:00
xia
85e7c6e1dc tidb: rename SetStatusInTrans to SetStatus 2015-09-17 16:08:46 +08:00
6ab4f8b64c tidb: add autocommit judgment and test 2015-09-17 09:40:50 +08:00
xia
127b0fba0e *: clean up and update test 2015-09-16 17:40:47 +08:00
xia
ee2a4cb93c tidb: fix a bug 2015-09-16 10:36:23 +08:00