← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/replication/replication.cc

  • Committer: Brian Aker
  • Date: 2008-12-02 16:33:43 UTC
  • mfrom: (632.1.19 devel)
  • Revision ID: brian@tangent.org-20081202163343-007ifg17p0lvjga7
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/replication/replication.cc
872
872
             We don't check session->lex->mi.log_file_name for NULL here
873
873
             since it is checked in sql_yacc.yy
874
874
          */
875
 
          strmake(mi->rli.until_log_name, session->lex->mi.log_file_name,
 
875
          strncpy(mi->rli.until_log_name, session->lex->mi.log_file_name,
876
876
                  sizeof(mi->rli.until_log_name)-1);
877
877
        }
878
878
        else if (session->lex->mi.relay_log_pos)
879
879
        {
880
880
          mi->rli.until_condition= Relay_log_info::UNTIL_RELAY_POS;
881
881
          mi->rli.until_log_pos= session->lex->mi.relay_log_pos;
882
 
          strmake(mi->rli.until_log_name, session->lex->mi.relay_log_name,
 
882
          strncpy(mi->rli.until_log_name, session->lex->mi.relay_log_name,
883
883
                  sizeof(mi->rli.until_log_name)-1);
884
884
        }
885
885
        else