diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2014-10-01 11:16:50 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2014-10-01 11:16:50 +0400 |
| commit | f80e4ed941ab28f3ee150d98ea6a411e51a8396f (patch) | |
| tree | 5e6b760f777c56c980b95d1471e8207e94621815 /storage/connect/filamtxt.cpp | |
| parent | e2567fb6ef4491e83ea1a5affea63f7c45110846 (diff) | |
| parent | 38c3fd2099577b932999766df41c77a81429fdc4 (diff) | |
| download | mariadb-git-f80e4ed941ab28f3ee150d98ea6a411e51a8396f.tar.gz | |
Merge 10.0-connect -> 10.0
Diffstat (limited to 'storage/connect/filamtxt.cpp')
| -rw-r--r-- | storage/connect/filamtxt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/filamtxt.cpp b/storage/connect/filamtxt.cpp index dfd5a6638cf..851faaaaf1a 100644 --- a/storage/connect/filamtxt.cpp +++ b/storage/connect/filamtxt.cpp @@ -287,7 +287,7 @@ bool TXTFAM::AddListValue(PGLOBAL g, int type, void *val, PPARM *top) // *((int*)pp->Value) = *((int*)val); // break; case TYPE_VOID: - pp->Value = (void*)(intptr)*(int*)val; + pp->Intval = *(int*)val; break; // case TYPE_STRING: // pp->Value = PlugSubAlloc(g, NULL, strlen((char*)val) + 1); |