← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/transaction_services.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:
drizzled/transaction_services.cc
1414
1414
    } 
1415
1415
    else 
1416
1416
    {
1417
 
      string_value= current_field->val_str(string_value);
 
1417
      string_value= current_field->val_str_internal(string_value);
1418
1418
      record->add_is_null(false);
1419
1419
      record->add_insert_value(string_value->c_ptr(), string_value->length());
1420
1420
      string_value->free();
1690
1690
      in_table->setReadSet(current_field->field_index);
1691
1691
 
1692
1692
      /* Read the string value of this field's contents */
1693
 
      string_value= current_field->val_str(string_value);
 
1693
      string_value= current_field->val_str_internal(string_value);
1694
1694
 
1695
1695
      /* 
1696
1696
       * Reset the read bit after reading field to its original state.  This 
1723
1723
       * 
1724
1724
       * @todo Move this crap into a real Record API.
1725
1725
       */
1726
 
      string_value= current_field->val_str(string_value,
1727
 
                                           old_record + 
1728
 
                                           current_field->offset(const_cast<unsigned char *>(new_record)));
 
1726
      string_value= current_field->val_str_internal(string_value,
 
1727
                                                    old_record + 
 
1728
                                                    current_field->offset(const_cast<unsigned char *>(new_record)));
1729
1729
      record->add_key_value(string_value->c_ptr(), string_value->length());
1730
1730
      string_value->free();
1731
1731
    }
1958
1958
         */
1959
1959
        const unsigned char *old_ptr= current_field->ptr;
1960
1960
        current_field->ptr= in_table->getUpdateRecord() + static_cast<ptrdiff_t>(old_ptr - in_table->getInsertRecord());
1961
 
        string_value= current_field->val_str(string_value);
 
1961
        string_value= current_field->val_str_internal(string_value);
1962
1962
        current_field->ptr= const_cast<unsigned char *>(old_ptr);
1963
1963
      }
1964
1964
      else
1965
1965
      {
1966
 
        string_value= current_field->val_str(string_value);
 
1966
        string_value= current_field->val_str_internal(string_value);
1967
1967
        /**
1968
1968
         * @TODO Store optional old record value in the before data member
1969
1969
         */