← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to sql/sql_repl.cc

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_repl.cc
1647
1647
  if (!mysql_bin_log.is_open())
1648
1648
  {
1649
1649
    my_message(ER_NO_BINARY_LOGGING, ER(ER_NO_BINARY_LOGGING), MYF(0));
1650
 
    return 1;
 
1650
    DBUG_RETURN(TRUE);
1651
1651
  }
1652
1652
 
1653
1653
  field_list.push_back(new Item_empty_string("Log_name", 255));
1714
1714
   @param file  pointer to io-cache
1715
1715
   @return 0
1716
1716
*/
1717
 
int log_loaded_block(IO_CACHE* file)
 
1717
int log_loaded_block(IO_CACHE* file,
 
1718
                     const uchar *buffert __attribute__((unused)),
 
1719
                     uint count __attribute__((unused)),
 
1720
                     my_off_t filepos __attribute__((unused)))
1718
1721
{
1719
1722
  DBUG_ENTER("log_loaded_block");
1720
1723
  LOAD_FILE_INFO *lf_info;