Commit Graph
5947 Commits
Author SHA1 Message Date
温绍锦 4a79e70d6b Merge pull request #3167 from alibaba/revert-3164-master-Mbean
Revert "解决Druid多classloader  Mbean注册卸载过程中的问题 "
2019-04-07 18:35:05 +08:00
温绍锦 6f9e8167cb Revert "解决Druid多classloader Mbean注册卸载过程中的问题 " 2019-04-07 18:34:52 +08:00
温绍锦 8c895c867e Merge pull request #3164 from Geker/master-Mbean
解决Druid多classloader  Mbean注册卸载过程中的问题
2019-04-07 18:27:44 +08:00
shaojin.wensj daef1b47cf bug fixed for keepAlive 2019-04-06 15:28:58 +08:00
songqingqing 9cd1805c00 优化Mbean的registerMBean&unregisterMBean方法的冲突问题 2019-04-02 19:13:20 +08:00
shaojin.wensj 4eb2d11d73 code format 2019-03-27 20:29:06 +08:00
shaojin.wensj 9f763c0dbe updater version 2019-03-27 17:07:11 +08:00
shaojin.wensj b89ad12d58 OracleSQLObjectImpl support none OracleASTVisitor 2019-03-25 20:19:50 +08:00
shaojin.wensj 768469fe4d Merge remote-tracking branch 'origin/master' 2019-03-20 15:28:44 +08:00
shaojin.wensj 116e7bee1a bug fixed for multi-thread use one connection. 2019-03-20 15:27:33 +08:00
温绍锦 e4530b503c Merge pull request #3139 from lihengming/master
fix word
2019-03-20 15:20:18 +08:00
lihengming e16341cbab fix word 2019-03-20 13:59:56 +08:00
温绍锦 ac47967a16 Merge pull request #3133 from dracula337435/从spring上下文中寻找全部Filter并注入
从spring上下文中寻找全部Filter并注入,以期让自定义Filter或借助spring管理的Filter更易融入druid
2019-03-20 13:48:16 +08:00
shaojin.wensj 9aa1798149 bug fixed for fail fast. 2019-03-19 19:48:42 +08:00
dk 59f86f0f42 从spring上下文中寻找全部Filter并注入,以期让自定义Filter或借助spring管理的Filter更易融入druid 2019-03-18 14:01:38 +08:00
shaojin.wensj c8ffb82508 update version 1.1.14 2019-02-26 22:14:28 +08:00
shaojin.wensj 5aba013040 update version to 1.1.15 2019-02-26 19:45:42 +08:00
shaojin.wensj 7da67deccc add more mysql loginfo 2019-02-26 16:25:29 +08:00
shaojin.wensj 45fe78e097 fixed testcase 2019-02-26 16:25:22 +08:00
温绍锦 ad9d59f1b3 Merge pull request #3063 from tblueprint/master
update sqlAggregate sql replace
2019-02-26 14:47:40 +08:00
温绍锦 7c02d8cda6 Merge pull request #3065 from sunsun314/stored-correct
Correct mysql `stored` keyword
2019-02-26 14:47:18 +08:00
shaojin.wensj d5003ee294 bug fixed for keepAlive 2019-02-26 11:09:47 +08:00
shaojin.wensj f8f928601a support mysql driver 5.0.x & 5.1.x & 6.0.x & 8.0.x 2019-02-25 16:08:03 +08:00
shaojin.wensj 799b7fba18 fixed testcase 2019-02-24 21:53:39 +08:00
shaojin.wensj e4465dfa7a add testcase 2019-02-24 21:40:59 +08:00
shaojin.wensj 7a38344453 bug fixed for #3085 2019-02-24 21:40:30 +08:00
shaojin.wensj 1f317383cd fixed testcase 2019-02-24 15:16:31 +08:00
温绍锦 fe502e2d4a Merge pull request #3092 from lihengming/master
for fix #1796, #3084
2019-02-24 14:20:11 +08:00
lihengming 0a0694524e update comment 2019-02-23 22:25:52 +08:00
lihengming ba74a38e39 update comment 2019-02-23 22:25:18 +08:00
lihengming 50781ea1e8 fix #1796, #3084 2019-02-23 22:07:01 +08:00
shaojin.wensj 24a83cddd1 bug fixed for PagerUtils, for issue #3081 2019-02-22 21:19:44 +08:00
shaojin.wensj c732a3569a improved sql parser hive support, for issue #3090 2019-02-22 20:22:35 +08:00
shaojin.wensj b1672775d3 bug fixed for pg sql parser. for issue #3091 2019-02-22 20:15:05 +08:00
shaojin.wensj e04e4ba219 bug fixed for sql parser, for issue #3080 2019-02-22 19:56:40 +08:00
shaojin.wensj 78656d488c fixed testcase 2019-02-22 17:57:11 +08:00
shaojin.wensj acf740f5b2 bug fixed for keepAlive 2019-02-22 17:57:00 +08:00
温绍锦 ae15e0c590 Merge pull request #3086 from ainilili/master
Some code optimizations and fixes
2019-02-22 14:03:16 +08:00
Nico 751247faca Remove unused import and fix error setter 2019-02-22 11:59:59 +08:00
Nico 35793b95dd Merge pull request #1 from alibaba/master
merge
2019-02-22 10:42:27 +08:00
sunsun314 3c73b18a0f Correct mysql stored keyword 2019-02-05 19:20:12 +08:00
shaojin.wensj 2245a6e451 update plugins version 2019-02-03 15:35:21 +08:00
shaojin.wensj 0b2f66c53a Merge branch 'master' of https://github.com/alibaba/druid 2019-02-03 10:24:05 +08:00
shaojin.wensj 60b579e878 bug fixed for SchemaStatVisitor, for issue #3058 2019-02-03 10:20:52 +08:00
liyao cd505ec2d1 update sqlAggregate sql replace 2019-02-03 08:54:02 +08:00
温绍锦 e26df987c0 Merge pull request #3056 from lihengming/master
for #3010
2019-01-31 10:02:19 +08:00
lihengming 2e2ca86f67 for #3010 2019-01-30 23:17:02 +08:00
lihengming 0e6854024d Merge branch 'master-upstream' 2019-01-30 22:54:41 +08:00
lihengming a790596897 for #3010 2019-01-30 22:54:02 +08:00
lihengming fa1df506c9 Merge remote-tracking branch 'upstream/master' 2019-01-30 22:42:32 +08:00