Merge anubis.xiphis.org:/usr/home/antony/work/p2-bug25513.5

  uint tmp_length;

  int error= 0;

  bool use_bulk_insert;

  bool auto_increment_update_required= table->next_number_field;

  bool auto_increment_update_required= (table->next_number_field != NULL);

  /* The string containing the values to be added to the insert */

  String values_string(values_buffer, sizeof(values_buffer), &my_charset_bin);