← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/slave.cc

  • Committer: Monty Taylor
  • Date: 2008-10-06 01:30:47 UTC
  • Revision ID: monty@inaugust.com-20081006013047-6m2ejc0c4peye2k9
Removed my_free(). It turns out that it had been def'd to ignore the flags passed to it in the second arg anyway. Gotta love that.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/slave.cc
2722
2722
                      "master could be corrupt but a more likely cause "
2723
2723
                      "of this is a bug"),
2724
2724
                    errmsg);
2725
 
    my_free((char*) tmp_buf, MYF(MY_ALLOW_ZERO_PTR));
 
2725
    free((char*) tmp_buf);
2726
2726
    return(1);
2727
2727
  }
2728
2728
 
2758
2758
    delete ev;
2759
2759
    mi->master_log_pos += inc_pos;
2760
2760
    pthread_mutex_unlock(&mi->data_lock);
2761
 
    my_free((char*)tmp_buf, MYF(0));
 
2761
    free((char*)tmp_buf);
2762
2762
    return(error);
2763
2763
  }
2764
2764
  default:
2808
2808
                      "master could be corrupt but a more likely cause of "
2809
2809
                      "this is a bug"),
2810
2810
                    errmsg);
2811
 
    my_free((char*) tmp_buf, MYF(MY_ALLOW_ZERO_PTR));
 
2811
    free((char*) tmp_buf);
2812
2812
    return(1);
2813
2813
  }
2814
2814
  pthread_mutex_lock(&mi->data_lock);