← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/slave.cc

  • Committer: brian
  • Date: 2008-08-01 17:27:37 UTC
  • mfrom: (261.1.6 drizzle)
  • Revision ID: brian@localhost.localdomain-20080801172737-v6f9pau23un0bwfl
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/slave.cc
2407
2407
        }
2408
2408
 
2409
2409
        /* Print any warnings issued */
2410
 
        List_iterator_fast<MYSQL_ERROR> it(thd->warn_list);
2411
 
        MYSQL_ERROR *err;
 
2410
        List_iterator_fast<DRIZZLE_ERROR> it(thd->warn_list);
 
2411
        DRIZZLE_ERROR *err;
2412
2412
        /*
2413
2413
          Added controlled slave thread cancel for replication
2414
2414
          of user-defined variables.