Commit Graph
5999 Commits
Author SHA1 Message Date
高铁 cc2c98d3ee code format 2019-08-27 10:02:56 +08:00
温绍锦 2220bedc8e Merge pull request #3255 from gdyjlqh/master
pgsql Driver 9.0以及以下版本不支持setQueryTimeout,可通过设置queryTimeout<0兼容低版本
2019-08-27 10:02:01 +08:00
温绍锦 fd43ca05bf Merge pull request #3305 from daitechang/master
typo
2019-08-27 09:58:54 +08:00
温绍锦 7bc9dff8e4 Merge pull request #3416 from zhangxueyii/fix-chinese-lang-notEmptyWaitMillis
修改中文notEmptyWaitMillis的中文描述和英文typo
2019-08-27 09:55:10 +08:00
Richard Zhang 143012deec fix lang 2019-08-23 14:29:10 +08:00
Richard Zhang ca125a9698 fix NotEmptyWaitMillis lang 2019-08-23 14:09:26 +08:00
温绍锦 e9f235fa36 Merge pull request #3398 from alibaba/recover_fatal_error
Recover fatal error
2019-08-22 10:46:59 +08:00
agapple 712d00e1d9 fixed testcase failed 2019-08-21 20:32:05 +08:00
agapple a8a2e60b9f fixed onFatalError emptySingle improve 2019-08-21 18:19:03 +08:00
agapple c2a8d3d7b2 fixed shrink bypass checkTime bug 2019-08-21 13:13:29 +08:00
agapple 109f95be76 fixed shrink 2019-08-21 13:06:13 +08:00
agapple f32d83d55e fixed onFatalError Recover 2019-08-21 12:37:48 +08:00
高铁 3943006477 recover fatal error 2019-08-20 21:36:11 +08:00
高铁 22e962b17c recover fatal error 2019-08-20 20:30:13 +08:00
高铁 6b9b189d41 recover fatal error 2019-08-20 19:52:54 +08:00
高铁 0666546a2f recover fatal error 2019-08-19 16:32:33 +08:00
高铁 4b2df57add change version to 1.1.19 1.1.19 2019-07-15 02:27:06 +08:00
高铁 35e27d21b5 Merge branch 'master' of https://github.com/alibaba/druid 2019-07-14 13:21:37 +08:00
高铁 39ac64c32e support JDBC 4.1 2019-07-14 13:21:15 +08:00
高铁 6368449a1d update version 1.1.18 2019-06-30 22:19:55 +08:00
daitechang 9419872d40 typo 2019-06-24 15:51:52 +08:00
温绍锦 8ad802e74b Merge pull request #3303 from lihengming/master
update doc dependency version for #3294
2019-06-22 22:30:42 +08:00
lihengming c200853e01 update doc dependency version 2019-06-22 21:55:14 +08:00
高铁 3dda738b59 improve getObject support, fixed #3194 2019-06-17 11:09:22 +08:00
gdyjlqh d8805ae98c pgsql Driver 9.0以及以下版本不支持setQueryTimeout,可通过设置queryTimeout<0兼容低版本 2019-05-30 02:50:02 +08:00
高铁 8dc5d2d307 add more error info for DataSourceDisableException 2019-05-27 19:09:56 +08:00
shaojin.wensj a2e5d01826 bug fixed for scheduler keepAlive support 2019-05-07 15:15:53 +08:00
shaojin.wensj fb1d83e64e bug fixed for scheduler keepAlive support 2019-05-07 13:46:12 +08:00
shaojin.wensj 2e0b24936b add license info 2019-05-06 23:25:47 +08:00
shaojin.wensj aea3ca118d Merge branch 'master' of https://github.com/alibaba/druid 2019-05-06 10:54:22 +08:00
shaojin.wensj 5ffa30a3ed bug fixed for keepAlive 2019-05-05 21:01:55 +08:00
温绍锦 a36bc07614 Merge pull request #3169 from digitalsonic/master
优化 HighAvailableDataSource 逻辑
2019-04-21 20:15:19 +08:00
温绍锦 3100f4f8fb Merge pull request #3193 from ty666/master
别字修改
2019-04-21 19:21:10 +08:00
taoyu 0eed60eff7 别字修改 2019-04-19 16:51:39 +08:00
shaojin.wensj bed981513b update version to 1.1.17 2019-04-18 19:36:42 +08:00
shaojin.wensj 725e936353 bug fixed for oracle explain output 2019-04-18 19:35:55 +08:00
DigitalSonic ce2e7a0179 add ER_ERROR_ON_CLOSE(1023) to MySqlExceptionSorter 2019-04-18 17:06:27 +08:00
DigitalSonic 07bcb98c99 fix import error 2019-04-09 00:59:48 +08:00
DigitalSonic 810128aed9 Merge remote-tracking branch 'upstream/master' 2019-04-09 00:36:35 +08:00
shaojin.wensj ea6f2599b2 update druid version 1.1.16 2019-04-07 20:14:36 +08:00
温绍锦 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