Commit 069355c6 authored by unknown's avatar unknown
Browse files

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
parents f71e0e27 bbe0990b

sql/sql_class.cc

+6 −8
Original line number Diff line number Diff line
@@ -1322,7 +1322,6 @@ bool select_export::send_data(List<Item> &items) 
  }

  row_count++;

  Item *item;

  char *buff_ptr=buff;

  uint used_length=0,items_left=items.elements;

  List_iterator_fast<Item> li(items);
@@ -1422,20 +1421,19 @@ bool select_export::send_data(List<Item> &items) 
	  goto err;

      }

    }

    buff_ptr=buff;				// Place separators here

    if (res && (!exchange->opt_enclosed || result_type == STRING_RESULT))

    {

      memcpy(buff_ptr,exchange->enclosed->ptr(),exchange->enclosed->length());

      buff_ptr+=exchange->enclosed->length();

      if (my_b_write(&cache, (byte*) exchange->enclosed->ptr(),

                     exchange->enclosed->length()))

        goto err;

    }

    if (--items_left)

    {

      memcpy(buff_ptr,exchange->field_term->ptr(),field_term_length);

      buff_ptr+=field_term_length;

    }

    if (my_b_write(&cache,(byte*) buff,(uint) (buff_ptr-buff)))

      if (my_b_write(&cache, (byte*) exchange->field_term->ptr(),

                     field_term_length))

        goto err;

    }

  }

  if (my_b_write(&cache,(byte*) exchange->line_term->ptr(),

		 exchange->line_term->length()))

    goto err;