Merge branch 'develop' into MAX-324

This commit is contained in:
Markus Makela
2015-02-16 14:58:35 +02:00
38 changed files with 32195 additions and 1388 deletions

View File

@ -1253,7 +1253,7 @@ char* skygw_get_affected_fields(GWBUF* buf)
List_iterator<Item> ilist(lex->current_select->item_list);
item = (Item*)ilist.next();
for (item; item != NULL; item=(Item*)ilist.next())
for (; item != NULL; item=(Item*)ilist.next())
{
itype = item->type();
@ -1627,7 +1627,7 @@ retblock:
skygw_query_op_t query_classifier_get_operation(GWBUF* querybuf)
{
LEX* lex = get_lex(querybuf);
skygw_query_op_t operation;
skygw_query_op_t operation = QUERY_OP_UNDEFINED;
if(lex){
switch(lex->sql_command){
case SQLCOM_SELECT: