Merge branch 'enh/dev3.0' into enh/addCompileError
This commit is contained in:
parent
a71bffd719
commit
479a117266
|
@ -21,8 +21,8 @@ extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "tcommon.h"
|
#include "tcommon.h"
|
||||||
#include "tvariant.h"
|
|
||||||
#include "tsimplehash.h"
|
#include "tsimplehash.h"
|
||||||
|
#include "tvariant.h"
|
||||||
|
|
||||||
struct SqlFunctionCtx;
|
struct SqlFunctionCtx;
|
||||||
struct SResultRowEntryInfo;
|
struct SResultRowEntryInfo;
|
||||||
|
@ -140,9 +140,10 @@ typedef struct STdbState {
|
||||||
void *param;
|
void *param;
|
||||||
void *env;
|
void *env;
|
||||||
SListNode *pComparNode;
|
SListNode *pComparNode;
|
||||||
void* pBackendHandle;
|
void *pBackend;
|
||||||
char idstr[64];
|
char idstr[64];
|
||||||
void *compactFactory;
|
void *compactFactory;
|
||||||
|
TdThreadRwlock rwLock;
|
||||||
|
|
||||||
void *db;
|
void *db;
|
||||||
void *pStateDb;
|
void *pStateDb;
|
||||||
|
|
Loading…
Reference in New Issue