← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/slave.cc

  • Committer: Brian Aker
  • Date: 2008-11-04 15:39:09 UTC
  • mfrom: (575.1.2 devel)
  • Revision ID: brian@tangent.org-20081104153909-c72hn65udxs1ccal
Merge of Monty's work

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/slave.cc
511
511
*/
512
512
 
513
513
int32_t start_slave_threads(bool need_slave_mutex, bool wait_for_start,
514
 
                        Master_info* mi,
515
 
                        const char* master_info_fname __attribute__((unused)),
516
 
                        const char* slave_info_fname __attribute__((unused)),
 
514
                        Master_info* mi, const char*, const char*,
517
515
                        int32_t thread_mask)
518
516
{
519
517
  pthread_mutex_t *lock_io=0,*lock_sql=0,*lock_cond_io=0,*lock_cond_sql=0;
1058
1056
    ignored events' end position for the use of the slave SQL thread, by
1059
1057
    calling this function. Only that thread can call it (see assertion).
1060
1058
 */
1061
 
static void write_ignored_events_info_to_relay_log(Session *session __attribute__((unused)),
 
1059
static void write_ignored_events_info_to_relay_log(Session *session,
1062
1060
                                                   Master_info *mi)
1063
1061
{
1064
1062
  Relay_log_info *rli= &mi->rli;
1463
1461
*/
1464
1462
 
1465
1463
static uint32_t read_event(DRIZZLE *drizzle,
1466
 
                        Master_info *mi __attribute__((unused)),
1467
 
                        bool* suppress_warnings)
 
1464
                           Master_info *mi,
 
1465
                           bool* suppress_warnings)
1468
1466
{
1469
1467
  uint32_t len;
1470
1468
 
1507
1505
}
1508
1506
 
1509
1507
 
1510
 
int32_t check_expected_error(Session* session __attribute__((unused)),
1511
 
                         Relay_log_info const *rli __attribute__((unused)),
1512
 
                         int32_t expected_error)
 
1508
int32_t check_expected_error(Session*, Relay_log_info const *,
 
1509
                             int32_t expected_error)
1513
1510
{
1514
1511
  switch (expected_error) {
1515
1512
  case ER_NET_READ_ERROR: