database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

Merge branch 'develop-1.1' into develop-1.2-merge-up-20190514

Browse Source
This commit is contained in:
Andrew Hutchings
2019-05-14 14:26:41 +01:00
parent 0dd33c6f75 f3be1db554
commit ee6575b013
8 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dbcon/mysql/ha_calpont_impl.cpp
View File

@ -1095,10 +1095,7 @@ uint32_t doUpdateDelete(THD* thd)
else
schemaName = string(item->db_name);
columnAssignmentPtr = new ColumnAssignment();
columnAssignmentPtr->fColumn = string(item->name.str);
columnAssignmentPtr->fOperator = "=";
columnAssignmentPtr->fFuncScale = 0;
columnAssignmentPtr = new ColumnAssignment(item->name, "=", "");
Item* value = value_it++;
if (value->type() == Item::STRING_ITEM)
@ -1222,8 +1219,9 @@ uint32_t doUpdateDelete(THD* thd)
else if ( value->type() == Item::NULL_ITEM )
{
// dmlStmt += "NULL";
columnAssignmentPtr->fScalarExpression = "NULL";
columnAssignmentPtr->fScalarExpression = "";
columnAssignmentPtr->fFromCol = false;
columnAssignmentPtr->fIsNull = true;
}
else if ( value->type() == Item::SUBSELECT_ITEM )
{