~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Lee Bieber
  • Date: 2010-10-21 01:33:55 UTC
  • mfrom: (1864.1.3 build)
  • Revision ID: kalebral@gmail.com-20101021013355-uywuclusdprnf8nl
Merge Brian - Add support for --with-valgrind
Merge Mark - event_observer.h did not declare "class Session;" so it depended on being #include'ed after "session.h".
Merge Andrew - Fix bug #663554: drizzledump is not honoring --destination-database option
Merge Andrew - Fix bug #663812: drizzledump truncation for DOUBLE data type with no preset scale/precision

Show diffs side-by-side

added added

removed removed

Lines of Context:
673
673
        else if (use->getKeypart() != 0)                // First found must be 0
674
674
          continue;
675
675
 
676
 
#ifdef HAVE_purify
 
676
#ifdef HAVE_VALGRIND
677
677
        /* Valgrind complains about overlapped memcpy when save_pos==use. */
678
678
        if (save_pos != use)
679
679
#endif
6158
6158
        {
6159
6159
          copy->set(tmp, item->result_field);
6160
6160
          item->result_field->move_field(copy->to_ptr,copy->to_null_ptr,1);
6161
 
#ifdef HAVE_purify
 
6161
#ifdef HAVE_VALGRIND
6162
6162
          copy->to_ptr[copy->from_length]= 0;
6163
6163
#endif
6164
6164
          copy++;