Commit Graph

897 Commits

Author SHA1 Message Date
hzcheng 9149d091fd
Merge pull request #1043 from taosdata/hotfix/slguan
#1041
2019-12-31 18:37:47 +08:00
haojun Liao 669f228beb
Merge pull request #1040 from taosdata/master-lihui
[#1039 TBASE-816]
2019-12-31 17:12:07 +08:00
slguan ea33f64fc1 #1041 2019-12-31 17:02:11 +08:00
lihui 5187b700aa [#1039 TBASE-816] 2019-12-31 16:55:20 +08:00
haojun Liao f9e94ff3b5
Merge pull request #1015 from taosdata/hotfix/slguan
#1014 group by nchar results incorrect in windows
2019-12-26 15:41:50 +08:00
slguan 38ce963e70 #1014 [TBASE-1376] 2019-12-25 18:44:50 +08:00
slguan dab5d07355 #1014 [TBASE-1376] 2019-12-25 18:43:52 +08:00
slguan 365795cae8 #1014 [TBASE-1376] 2019-12-25 18:40:59 +08:00
slguan 4b5f0c12db Merge branch 'master' into hotfix/slguan 2019-12-25 18:35:47 +08:00
slguan 8f3fe94ae9 #1014 [TBASE-1376] 2019-12-25 18:35:21 +08:00
fangpanpan dec249cfac
Merge pull request #1007 from taosdata/master-lihui
[#1005 TBASE-1392]
2019-12-24 17:52:05 +08:00
lihui 5bcdd606ba [#1005 TBASE-1392] 2019-12-24 17:50:01 +08:00
plum-lihui 702efe5da1
Merge pull request #994 from taosdata/hotfix/slguan
SQL "show vnodes <dnodeIp>" executes incorrectly
2019-12-21 17:23:18 +08:00
slguan 29166b24a9 [TBASE-1387] #992 2019-12-21 17:09:36 +08:00
haojun Liao 54af4c1861
Merge pull request #978 from taosdata/hotfix/slguan
#586 [TBASE-1330]
2019-12-21 15:08:48 +08:00
slguan bba2bbf1ab #586 [TBASE-1330] 2019-12-21 15:04:06 +08:00
slguan b70170018a #586 [TBASE-1330] 2019-12-20 18:42:53 +08:00
haojun Liao 40a4ae1fd2
Merge pull request #976 from taosdata/hotfix/slguan
#586 [TBASE-1330]
2019-12-20 18:40: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