diff options
| author | lars@mysql.com <> | 2004-12-04 13:10:36 +0100 |
|---|---|---|
| committer | lars@mysql.com <> | 2004-12-04 13:10:36 +0100 |
| commit | 414591915c0321ae8d2a6debc73135a7172dbc5a (patch) | |
| tree | a0d275579d3e457f5282decb0d2db4bd20f03438 | |
| parent | 1b07e3b2dbfcefba390b00fe946ebb965d435f87 (diff) | |
| parent | f900433bbe0cb1853c74be1c876cf0c5978f9a62 (diff) | |
| download | mariadb-git-414591915c0321ae8d2a6debc73135a7172dbc5a.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/bXXXX-4.1
| -rw-r--r-- | sql/slave.cc | 2 | ||||
| -rw-r--r-- | sql/slave.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index b5caf2627a6..bd9650ed369 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -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"); diff --git a/sql/slave.h b/sql/slave.h index a4d123329c6..08cf0806717 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -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 |