Commit 07fc5f78 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/bXXXX-4.1

parents 56080a8d f2d6046e

sql/slave.cc

+1 −1
Original line number Diff line number Diff line
@@ -759,7 +759,7 @@ static TABLE_RULE_ENT* find_wild(DYNAMIC_ARRAY *a, const char* key, int len) 
    1           should be logged/replicated                  

*/



int tables_ok(THD* thd, TABLE_LIST* tables)

bool tables_ok(THD* thd, TABLE_LIST* tables)

{

  bool some_tables_updating= 0;

  DBUG_ENTER("tables_ok");

sql/slave.h

+1 −1
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ int show_master_info(THD* thd, MASTER_INFO* mi); 
int show_binlog_info(THD* thd);



/* See if the query uses any tables that should not be replicated */

int tables_ok(THD* thd, TABLE_LIST* tables);

bool tables_ok(THD* thd, TABLE_LIST* tables);



/*

  Check to see if the database is ok to operate on with respect to the