database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-08 14:22:09 +03:00
Code Activity

Merge for 13264feb7 that is the fix for multiple LDI issues described in MCOL-4320/4364/4370

Browse Source
This commit is contained in:
Roman Nozdrin
2020-11-17 11:38:25 +00:00
parent 58495d0d2f
commit 31e0909552
3 changed files with 70 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dbcon/mysql/ha_mcs_dml.cpp
View File

@@ -736,9 +736,15 @@ int ha_mcs_impl_write_batch_row_(const uchar* buf, TABLE* table, cal_impl_if::ca
const datatypes::TypeHandler *h= colType.typeHandler();
if (h) // QQ: error reporting
{
datatypes::ColBatchWriter writer(ci.filePtr, ci.delimiter,
ci.enclosed_by, ci.utf8);
datatypes::WriteBatchFieldMariaDB field(table->field[colpos], colType);
datatypes::ColBatchWriter writer(ci.filePtr,
ci.delimiter,
ci.enclosed_by);
Field* fieldPtr= table->field[colpos];
uint32_t mbmaxlen = (fieldPtr->charset() && fieldPtr->charset()->mbmaxlen)
? fieldPtr->charset()->mbmaxlen : 0;
datatypes::WriteBatchFieldMariaDB field(fieldPtr,
colType,
mbmaxlen);
idbassert(table == table->field[colpos]->table);
buf+= h->ColWriteBatch(&field, buf, nullVal, writer);
}