Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51 sql/sql_class.cc: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged storage/ndb/test/ndbapi/testNodeRestart.cpp: Auto merged storage/ndb/test/run-test/daily-basic-tests.txt: Auto merged storage/ndb/test/src/UtilTransactions.cpp: Auto merged
This commit is contained in:
commit
069355c68b
@ -1322,7 +1322,6 @@ bool select_export::send_data(List<Item> &items)
|
|||||||
}
|
}
|
||||||
row_count++;
|
row_count++;
|
||||||
Item *item;
|
Item *item;
|
||||||
char *buff_ptr=buff;
|
|
||||||
uint used_length=0,items_left=items.elements;
|
uint used_length=0,items_left=items.elements;
|
||||||
List_iterator_fast<Item> li(items);
|
List_iterator_fast<Item> li(items);
|
||||||
|
|
||||||
@ -1422,20 +1421,19 @@ bool select_export::send_data(List<Item> &items)
|
|||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
buff_ptr=buff; // Place separators here
|
|
||||||
if (res && (!exchange->opt_enclosed || result_type == STRING_RESULT))
|
if (res && (!exchange->opt_enclosed || result_type == STRING_RESULT))
|
||||||
{
|
{
|
||||||
memcpy(buff_ptr,exchange->enclosed->ptr(),exchange->enclosed->length());
|
if (my_b_write(&cache, (byte*) exchange->enclosed->ptr(),
|
||||||
buff_ptr+=exchange->enclosed->length();
|
exchange->enclosed->length()))
|
||||||
|
goto err;
|
||||||
}
|
}
|
||||||
if (--items_left)
|
if (--items_left)
|
||||||
{
|
{
|
||||||
memcpy(buff_ptr,exchange->field_term->ptr(),field_term_length);
|
if (my_b_write(&cache, (byte*) exchange->field_term->ptr(),
|
||||||
buff_ptr+=field_term_length;
|
field_term_length))
|
||||||
}
|
|
||||||
if (my_b_write(&cache,(byte*) buff,(uint) (buff_ptr-buff)))
|
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (my_b_write(&cache,(byte*) exchange->line_term->ptr(),
|
if (my_b_write(&cache,(byte*) exchange->line_term->ptr(),
|
||||||
exchange->line_term->length()))
|
exchange->line_term->length()))
|
||||||
goto err;
|
goto err;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user