Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity
4,345 Commits 16 Branches 87 Tags
b4e987771969e87f8139c68075f231eb45ba4cb7
Commit Graph
4345 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Yako b4e9877719 Merge pull request #971 from yakolee/master 
1.0.16
1.0.16 		2015-10-10 14:57:45 +08:00
Yako 4ed1235a90 1.0.16 2015-10-10 14:55:47 +08:00
Yako 6698ba72a5 Merge pull request #965 from yakolee/master 
support select ... from update .. for alibaba mysql
 2015-09-24 17:21:20 +08:00
Yako 5504c7125e support select ... from update .. for alibaba mysql 2015-09-24 17:18:22 +08:00
高铁 370604fd82 Merge pull request #964 from zhujunxxxxx/master 
增加mysql存储过程创建时参数的可选类型
 2015-09-24 14:26:29 +08:00
zhujunxxxxx 1150f45f39 fixed issue#949 2015-09-21 21:24:22 +08:00
zhujunxxxxx dc45cd0a92 增加mysql创建存储过程时参数可选类型IN|OUT|INOUT 2015-09-20 19:37:17 +08:00
zz 44660a589c Merge pull request #2 from alibaba/master 
merge
 2015-09-19 13:53:53 +08:00
高铁 7a39d8dff1 Merge pull request #963 from wenshao/master 
refactor sql parser, support open/close statement
 2015-09-19 13:21:27 +08:00
高铁 12bef9bb54 refactor sql parser, support open/close statement 2015-09-19 13:20:14 +08:00
高铁 03c5436d8c Merge pull request #962 from wenshao/master 
Bug fixed for LogFilter
 2015-09-19 11:23:23 +08:00
高铁 383e45c1dd Bug fixed for LogFilter 2015-09-19 11:25:23 +08:00
高铁 31ca632104 Merge pull request #959 from zhujunxxxxx/master 
support cursor in mysql's procedure
 2015-09-18 22:52:43 +08:00
zhujunxxxxx c6b5890fed support cursor in mysql's procedure 2015-09-16 23:42:11 +08:00
高铁 6ac76acdfe Merge pull request #958 from zhujunxxxxx/master 
修复MySql存储过程中IF,CASE,WHILE语句结尾需要分号
 2015-09-14 22:25:52 +08:00
zhujunxxxxx 02a8376f09 增加mysql存储过程LOOP,REPAET,LEAVE,ITEARATE语法支持,以及支持BEGIN-END和WHILE语句标签支持 2015-09-14 18:32:27 +08:00
zhujunxxxxx 44ce8cb8fa fix procedure statement need SEMI end 2015-09-14 13:32:19 +08:00
zhujunxxxxx 01de65e16e 修复存储过程语句句尾需要分号 2015-09-14 13:19:47 +08:00
Yako df81c0af90 Merge pull request #957 from yakolee/master 
add license
 2015-09-14 11:24:18 +08:00
Yako 66775232a6 add license 2015-09-14 11:23:05 +08:00
zz 6469d239eb Merge pull request #1 from alibaba/master 
update 1
 2015-09-14 09:52:28 +08:00
高铁 ed3dbe7485 Merge pull request #954 from zhujunxxxxx/master 
增加mysql对procedure语法的识别
 2015-09-12 23:34:30 +08:00
高铁 1bcd5eda86 Merge pull request #956 from wenshao/master 
bug fixed for phyConnectTimeMillis
 2015-09-12 23:24:04 +08:00
高铁 a6c9cd80c1 bug fixed for phyConnectTimeMillis 2015-09-12 23:25:17 +08:00
高铁 887d538a91 bug fixed for pg sql parser 2015-09-12 22:52:45 +08:00
高铁 d283cd76a6 Merge pull request #955 from wenshao/master 
bug fixed for pg sql parser
 2015-09-12 22:51:01 +08:00
zhujunxxxxx 4a66c27b31 增加mysql对procedure语法的识别 2015-09-11 20:10:39 +08:00
高铁 ec0e19ec52 Merge pull request #947 from wenshao/master 
bug fixed for mysql connection validation checker, and improved odps …
 2015-09-07 11:27:10 +08:00
高铁 820e9f3581 bug fixed for mysql connection validation checker, and improved odps sql formatter 2015-09-07 11:28:16 +08:00
Yako bbcbad629c Merge pull request #945 from yakolee/master 
update license
 2015-09-01 15:53:24 +08:00
Yako 9c42bfa2b5 update license 2015-09-01 15:52:13 +08:00
高铁 961ae42433 improved sql formatter 2015-08-31 23:50:06 +08:00
高铁 7a2f364af3 Merge pull request #943 from wenshao/master 
improved sql formatter
 2015-08-31 23:48:38 +08:00
高铁 549c66a7ea improved odps sql formmater 2015-08-31 20:57:48 +08:00
高铁 2aff049506 Merge pull request #942 from wenshao/master 
improved odps sql formatter
 2015-08-31 20:56:29 +08:00
高铁 e0ad248845 improved odps sql parser, support distribute by 2015-08-26 19:39:56 +08:00
高铁 ac2e74da98 Merge pull request #941 from wenshao/master 
improved odps sql parser, support distribute by
 2015-08-26 19:38:40 +08:00
高铁 91edb244f2 Merge pull request #930 from 52Jolynn/master 
修复若干bug及增加若干特性
 2015-08-22 00:53:52 +08:00
高铁 9007375ca0 Merge pull request #938 from lstoars/master 
1.修复自定义加密key的bug;2.修改生成加密密码的main方法。
 2015-08-22 00:53:17 +08:00
高铁 17e158759f Merge pull request #939 from blackshadowwalker/master 
处理 mysql 8 小时超时问题 和 修改丢弃连接堆栈
 2015-08-22 00:51:45 +08:00
lijian af74742212 syn pom.xml 2015-08-18 17:02:26 +08:00
lijian 4e39c48772 syn alibaba/druid/master 2015-08-18 16:58:23 +08:00
lijian a64b9f9287 syn alibaba/druid/master 2015-08-18 16:53:36 +08:00
lijian dace336b0d Merge remote-tracking branch 'karl/master' into 20150818-phyTimeoutMillis 
Conflicts:
	pom.xml
	src/main/java/com/alibaba/druid/pool/DruidDataSource.java
	src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java
 2015-08-18 16:03:13 +08:00
lijian 2c09b80eff 1.系统计时器的时间(connectedTimeNano)记录到日志中不能准确的反映连接的时间（connectedTimeNano），换用（增加参数） connectedTimeMillis 记录获取连接的时间 
2.处理 mysql 8 小时超时问题(即使testWhileIdle=false,testOnBorrow=false,testOnReturn=false)，在物理连接的已连接时间超过 phyTimeoutMillis(默认7小时) 后就自动关闭该物理连接
3.修正单词拼写 destoryTask -> destroyTask
 2015-08-18 15:54:35 +08:00
lstoars f2f2479199 1.修复自定义加密key的bug;2.修改生成随机密码的main方法。 2015-08-18 13:43:03 +08:00
高铁 883b1fbc64 fixed copyright 2015-08-16 23:45:03 +08:00
高铁 e6a637890a Merge pull request #936 from wenshao/master 
fixed copyright
 2015-08-16 23:44:57 +08:00
高铁 0db015cc16 Merge pull request #933 from wenshao/master 
MySqlValidConnectionChecker use pingInternal replace ping
 2015-08-08 15:47:10 +08:00
shaojin.wensj b35ea0326f MySqlValidConnectionChecker use pingInternal replace ping 2015-08-08 15:46:23 +08:00