← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/handler.cc

Merge of Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/handler.cc
2693
2693
    We cache the table flags if the locking succeeded. Otherwise, we
2694
2694
    keep them as they were when they were fetched in ha_open().
2695
2695
  */
2696
 
  DRIZZLE_EXTERNAL_LOCK(lock_type);
2697
2696
 
2698
2697
  int error= external_lock(session, lock_type);
 
2698
 
2699
2699
  if (error == 0)
2700
2700
    cached_table_flags= table_flags();
2701
2701
  return error;
2726
2726
int handler::ha_write_row(unsigned char *buf)
2727
2727
{
2728
2728
  int error;
2729
 
  DRIZZLE_INSERT_ROW_START();
2730
2729
 
2731
2730
  /* 
2732
2731
   * If we have a timestamp column, update it to the current time 
2740
2739
  mark_trx_read_write();
2741
2740
 
2742
2741
  if (unlikely(error= write_row(buf)))
 
2742
  {
2743
2743
    return error;
 
2744
  }
2744
2745
 
2745
2746
  if (unlikely(log_row_for_replication(table, 0, buf)))
2746
2747
    return HA_ERR_RBR_LOGGING_FAILED; /* purecov: inspected */
2747
2748
 
2748
 
  DRIZZLE_INSERT_ROW_END();
2749
2749
  return 0;
2750
2750
}
2751
2751
 
2763
2763
  mark_trx_read_write();
2764
2764
 
2765
2765
  if (unlikely(error= update_row(old_data, new_data)))
 
2766
  {
2766
2767
    return error;
 
2768
  }
2767
2769
 
2768
2770
  if (unlikely(log_row_for_replication(table, old_data, new_data)))
2769
2771
    return HA_ERR_RBR_LOGGING_FAILED;