Commit Graph

7583 Commits

Author SHA1 Message Date
Shengliang Guan 28cef33a72 minor changes 2020-08-28 13:08:34 +08:00
Shengliang Guan e16572e459 Merge remote-tracking branch 'origin/fmaster/lihui' into feature/os 2020-08-28 13:04:25 +08:00
Hui Li 89744f4ba8 [release version modify] 2020-08-28 13:00:53 +08:00
Shengliang Guan ae8fbb6b21 TD-1090 compile error in windows 2020-08-28 11:57:40 +08:00
Shengliang Guan 50e73ebbce
Merge pull request #3277 from zwllxs/patch-1
Update administrator-ch.md
2020-08-28 10:35:18 +08:00
Shengliang Guan 9f158b9d48 minor changes 2020-08-28 10:28:12 +08:00
Shengliang Guan 9e97c25d3c
Merge pull request #3132 from taosdata/feature/query
Feature/query
2020-08-28 10:26:46 +08:00
zwllxs 5242848a82
Update administrator-ch.md 2020-08-28 10:06:01 +08:00
Shengliang Guan 5b42f5d586
Merge pull request #3271 from taosdata/master
Merge from master into develop
2020-08-27 22:47:54 +08:00
Haojun Liao 3c45dcdee9 [td-255] replace wcsncpy with memcpy 2020-08-27 22:26:37 +08:00
Shengliang Guan 58408892da minor changes 2020-08-27 21:11:57 +08:00
Shengliang Guan d9faca1c01
Merge pull request #3255 from taosdata/hotfix/sync
Hotfix/sync
2020-08-27 21:08:27 +08:00
Shengliang Guan 037f561c95
Merge pull request #3267 from taosdata/hotfix/TD-857
TD-857
2020-08-27 21:06:56 +08:00
Shengliang Guan 37c2d3eb7d minor changes 2020-08-27 13:06:19 +00:00
yihaoDeng df013fc336 TD-857 2020-08-27 11:13:20 +00:00
Haojun Liao fdbd8fe099 [td-255] update the sim 2020-08-27 18:40:23 +08:00
Haojun Liao 76ad0bc70e [td-255] add check for memory allocation failure. 2020-08-27 18:32:34 +08:00
Shengliang Guan 3d655a7932
Merge pull request #3258 from taosdata/mergetodevelop
Merge from master into develop
2020-08-27 17:22:56 +08:00
Shengliang Guan bd908f4ab0
Merge branch 'develop' into mergetodevelop 2020-08-27 17:22:22 +08:00
Shengliang Guan 9028c1de9a
Merge pull request #3263 from taosdata/hotfix/connrelease
Update mnodeProfile.c
2020-08-27 17:20:29 +08:00
Shengliang Guan c190ea20b6
Merge pull request #3261 from taosdata/fmaster/lihui
[TD-1203]
2020-08-27 17:05:41 +08:00
haojun Liao abc80f352e
Update mnodeProfile.c
Update the mnode connection activity time
2020-08-27 16:28:26 +08:00
Hui Li 460ae42c09 [TD-1203] 2020-08-27 16:20:48 +08:00
Shengliang Guan c225051429
Merge pull request #3257 from taosdata/hotfix/TD-1009
fixbug connection killing led floating point exception
2020-08-27 15:39:53 +08:00
Haojun Liao d5abee89dd [td-255] fix compiler error 2020-08-27 15:04:19 +08:00
Haojun Liao 13cd54637b [td-255] fix compiler error 2020-08-27 14:50:53 +08:00
yihaoDeng 65f750a087 fixbug connection killing led floating point exception 2020-08-27 06:47:59 +00:00
Shengliang Guan b3a78f8fea Merge remote-tracking branch 'origin/master' into hotfix/sync 2020-08-27 05:42:13 +00:00
Shengliang Guan 158f7b2ed6 TD-1201 change filesize from 32bits to 64bits 2020-08-27 05:42:02 +00:00
Shengliang Guan 0a27418f74
Merge pull request #3251 from taosdata/bugfix/td-1242
wait again when sem_wait returns EINTR
2020-08-27 13:41:26 +08:00
Shengliang Guan a2f484fe0a
Merge pull request #3253 from taosdata/hotfix/os
Hotfix/os
2020-08-27 11:36:00 +08:00
Shengliang Guan 383ca2f2cb Merge from master 2020-08-27 02:21:31 +00:00
Bomin Zhang 829caf39d3 td-1242: wait again if sem_wait returns EINTR 2020-08-27 10:12:54 +08:00
Shengliang Guan 5da3bbeb42
Merge pull request #3215 from amoskong/history_err
install.sh: create empty history file after installation
2020-08-27 09:36:04 +08:00
Bomin Zhang a393cc7524 fix td-1242 2020-08-27 09:26:31 +08:00
Shengliang Guan 942c70c5e0 minor changes 2020-08-26 13:27:43 +00:00
Shengliang Guan 9f8e81a5de minor changes 2020-08-26 19:31:40 +08:00
Shengliang Guan dd1278c6f9 TD-1090 remove version.c and add version to taos.dll 2020-08-26 19:08:07 +08:00
Haojun Liao 6e43fe5217 [td-621] 2020-08-26 18:24:25 +08:00
Shengliang Guan bd16bb3d23 TD-1214 change csharp driver in win32 2020-08-26 17:36:57 +08:00
Shengliang Guan 5da374322a
Merge pull request #3246 from taosdata/fmaster/lihui
[add arbitrator default port in docker]
2020-08-26 17:30:37 +08:00
Hui Li f3e15cc979 [add arbitrator default port in docker] 2020-08-26 16:15:37 +08:00
Haojun Liao 3326df4873 [td-225] change python script version. 2020-08-26 16:01:53 +08:00
Haojun Liao e1c7529961 Merge branch 'develop' into feature/query 2020-08-26 15:53:29 +08:00
Haojun Liao 53a7e3d62b [td-225] add test case for join query. 2020-08-26 15:51:52 +08:00
Shengliang Guan fea2469562
Merge pull request #3244 from taosdata/feature/os
hotfix/os
2020-08-26 15:39:39 +08:00
Shengliang Guan 06d188e982 minor changes 2020-08-26 06:47:19 +00:00
Shengliang Guan f9f9580f9a TD-1238 add error code while unable to resolve fqdn 2020-08-26 06:45:35 +00:00
Shengliang Guan 95fc76d6ec
Merge pull request #3242 from taosdata/jtao1735-patch-8
Update architecture-ch.md
2020-08-26 14:38:58 +08:00
Jeff Tao 5e17894fba
Update architecture-ch.md 2020-08-26 14:33:03 +08:00