~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field_conv.cc

  • Committer: Monty Taylor
  • Date: 2008-10-20 08:48:34 UTC
  • mfrom: (520.1.22 drizzle)
  • Revision ID: monty@inaugust.com-20081020084834-xpb3w01vkcp55o02
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
444
444
                                         to_char_length, &well_formed_error);
445
445
  if (length < from_length)
446
446
  {
447
 
    if (current_thd->count_cuted_fields)
 
447
    if (current_session->count_cuted_fields)
448
448
      copy->to_field->set_warning(DRIZZLE_ERROR::WARN_LEVEL_WARN,
449
449
                                  ER_WARN_DATA_TRUNCATED, 1);
450
450
  }
481
481
                                         char_length, &well_formed_error);
482
482
  if (length < from_length)
483
483
  {
484
 
    if (current_thd->count_cuted_fields)
 
484
    if (current_session->count_cuted_fields)
485
485
      copy->to_field->set_warning(DRIZZLE_ERROR::WARN_LEVEL_WARN,
486
486
                                  ER_WARN_DATA_TRUNCATED, 1);
487
487
  }