database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

Updated with latest InfiniDB Develop (4.6.6)

Browse Source
This commit is contained in:
David Hall
2016-01-14 10:27:21 -06:00
parent f6afc42dd0
commit 1bd427486c
27 changed files with 556 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/mysql/ha_calpont_dml.cpp
View File

@ -708,7 +708,7 @@ int ha_calpont_impl_write_batch_row_(uchar *buf, TABLE* table, cal_impl_if::cal_
if (colpos == ci.columnTypes.size())
break;
if (headerByte >= ci.headerLength)
if (ci.headerLength > 0 && headerByte >= ci.headerLength)
{
// We've used more null bits than allowed. Something is seriously wrong.
std::string errormsg = "Null bit header is wrong size";

1
dbcon/mysql/my.cnf
View File

@ -78,6 +78,7 @@ plugin_dir = /usr/local/Calpont/mysql/lib/mysql/plugin
# Replication Master Server (default)
# binary logging is required for replication
# log-bin=mysql-bin
# binlog_format=ROW
# required unique id between 1 and 2^32 - 1
# defaults to 1 if master-host