← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/filesystem_engine/filesystem_engine.cc

  • Committer: Brian Aker
  • Date: 2010-12-16 04:01:22 UTC
  • mfrom: (1996.2.1 compare)
  • Revision ID: brian@tangent.org-20101216040122-eodh5shwsij35ybe
Merge in uuid tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/filesystem_engine/filesystem_engine.cc
563
563
        if ((*field)->isReadSet() || (*field)->isWriteSet())
564
564
        {
565
565
          (*field)->setWriteSet();
566
 
          (*field)->store(content.c_str(),
567
 
                          (uint32_t)content.length(),
568
 
                          &my_charset_bin,
569
 
                          CHECK_FIELD_WARN);
 
566
          (*field)->store_and_check(CHECK_FIELD_WARN,
 
567
                                    content.c_str(),
 
568
                                    (uint32_t)content.length(),
 
569
                                    &my_charset_bin);
570
570
        }
571
571
        else
 
572
        {
572
573
          (*field)->set_default();
 
574
        }
573
575
      }
574
576
      else
575
577
        (*field)->set_null();
631
633
        if ((*field)->isReadSet() || (*field)->isWriteSet())
632
634
        {
633
635
          (*field)->setWriteSet();
634
 
          (*field)->store(content.c_str(),
635
 
                          (uint32_t)content.length(),
636
 
                          &my_charset_bin,
637
 
                          CHECK_FIELD_WARN);
 
636
          (*field)->store_and_check(CHECK_FIELD_WARN,
 
637
                                    content.c_str(),
 
638
                                    (uint32_t)content.length(),
 
639
                                    &my_charset_bin);
638
640
        }
639
641
        else
640
642
        {