Commit Graph

880 Commits

Author SHA1 Message Date
slguan b70170018a #586 [TBASE-1330] 2019-12-20 18:42:53 +08:00
slguan edeb80f4f6 #586 [TBASE-1330] 2019-12-20 18:25:27 +08:00
slguan 46dd88a921
Merge pull request #973 from taosdata/master-lihui
[TBASE-1360]
2019-12-20 15:20:53 +08:00
lihui 14349874f4 [TBASE-1360] 2019-12-20 15:17:05 +08:00
slguan 3f19b39492
Merge pull request #967 from taosdata/hz_master
add a simple assert
2019-12-20 10:20:56 +08:00
Hongze Cheng b63241867c add a simple assert 2019-12-20 10:09:56 +08:00
haojun Liao c8fff94537
Merge pull request #954 from taosdata/feature/#928
Data write request is not redirected in multiple copies, causing slow write speed
2019-12-19 17:50:43 +08:00
slguan ed942e8f1c #952 [TBASE-1356] 2019-12-19 17:39:56 +08:00
haojun Liao 31ea35243f
Merge pull request #950 from taosdata/feature/#928
SQL statement `show connections` may cause crash
2019-12-19 17:25:08 +08:00
slguan 96329ea18c #949 2019-12-19 14:09:03 +08:00
slguan a5805df141
Merge pull request #947 from taosdata/hjxilinx-patch-2
Update vnodeQueryImpl.c
2019-12-19 13:42:27 +08:00
haojun Liao 50865d282e
Update vnodeQueryImpl.c
fix a bug referred in issue #946
2019-12-19 13:29:00 +08:00
slguan c5e5f4c663
Merge pull request #940 from taosdata/patch/errmsg
improve error message of multiple file import
2019-12-19 10:21:02 +08:00
localvar 6ace40b361 improve error message of multiple file import 2019-12-18 14:54:15 +08:00
hzcheng 868a243a05
Merge pull request #936 from taosdata/feature/#928
Feature/#928
2019-12-17 15:45:25 +08:00
slguan b5421c1421 #928 2019-12-16 21:46:38 +08:00
slguan d62c5c3023 #928 2019-12-16 19:03:44 +08:00
slguan 2b21a75ae0 #928 2019-12-16 18:59:18 +08:00
fangpanpan 3ed436cce2
Merge pull request #927 from taosdata/feature-master/lihui
[TBASE-1348]
2019-12-16 14:46:57 +08:00
lihui 8a37c33fad [TBASE-1348] 2019-12-16 14:35:23 +08:00
fangpanpan ebce945ee1
Merge pull request #924 from taosdata/feature-master/lihui
[TBASE-1337]
2019-12-16 13:55:54 +08:00
lihui 193d2bc309 [TBASE-1337] 2019-12-16 13:52:30 +08:00
plum-lihui d129e3bf7f
Merge pull request #923 from taosdata/hotfix/#921
#921
2019-12-16 11:45:00 +08:00
slguan 5294542e2c #921 2019-12-16 11:22:40 +08:00
plum-lihui 69db6f24cc
Merge pull request #914 from taosdata/hotfix/TBASE-1273
can drop non-existent database
2019-12-12 16:02:39 +08:00
slguan 7301d83d11 Merge branch 'hotfix/TBASE-1325' 2019-12-10 19:30:08 +08:00
slguan a26f368c21 [TBASE-1325] 2019-12-10 19:18:16 +08:00
slguan 19e7565930
Merge pull request #899 from taosdata/hotfix-#898
Update tscUtil.c
2019-12-10 18:01:13 +08:00
haojun Liao 7538f4e755
Update tscSQLParser.c 2019-12-10 17:57:06 +08:00
haojun Liao e08aa1ab03
Update tscUtil.c
fix bugs in issue #898
2019-12-10 17:45:41 +08:00
slguan 430f1e4303
Merge pull request #891 from taosdata/feature-master/lihui
[TBASE-1142/1319]
2019-12-10 10:44:28 +08:00
lihui 103b8794da [TBASE-1142/1319] 2019-12-10 10:36:12 +08:00
slguan acb19de9d4 can drop non-existent database 2019-12-09 15:52:08 +08:00
slguan b9a62d60dc
Merge pull request #869 from taosdata/hotfix/#868
fix #868
2019-12-07 15:03:45 +08:00
Hongze Cheng 79b2344c47 fix #868 2019-12-07 15:00:22 +08:00
fangpanpan bcc03bad21
Merge pull request #863 from taosdata/release/v1.6.4.2
Release/v1.6.4.2
2019-12-06 14:24:58 +08:00
slguan c972e1ca8f version.c 2019-12-06 13:59:39 +08:00
slguan cbdeb351df version.c 2019-12-06 13:53:26 +08:00
hzcheng 514f2ed512
Merge pull request #860 from taosdata/hotfix/TBASE-1284
[TBASE-1284]
2019-12-06 10:25:12 +08:00
slguan a56b019a25 [TBASE-1284] 2019-12-06 10:21:27 +08:00
slguan 92a9613e7c [TBASE-1284] 2019-12-06 10:14:07 +08:00
slguan a425bb51c6
Merge pull request #857 from taosdata/hotfix/#856
fix #856
2019-12-05 15:46:37 +08:00
Hongze Cheng cff3009a41 fix #856 2019-12-05 15:40:09 +08:00
slguan 527027d5f9
Merge pull request #844 from taosdata/feature/liaohj
[tbase-1269]
2019-12-04 10:03:27 +08:00
haojun Liao 893fac9da7
Merge pull request #824 from taosdata/hotfix/restful1
Hotfix/restful1
2019-12-02 21:37:55 +08:00
slguan de5047f4b2
Merge pull request #821 from taosdata/feature/lihui
Feature/lihui
2019-12-02 20:37:41 +08:00
slguan 2002c8e20b rror may occur when reading http chunked body 2019-12-02 20:34:32 +08:00
lihui d468cc5eb2 [TBASE-1271] 2019-12-02 19:01:20 +08:00
slguan 5e2d9325fd
Merge pull request #815 from taosdata/hotfix/#813
Hotfix/#813
2019-12-02 16:19:16 +08:00
Hongze Cheng 167d6cb70e fix #813 2019-12-02 15:47:18 +08:00