diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-06-02 10:44:48 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-06-02 10:44:48 +0200 |
| commit | a46f4cf4975a60ff6d8d2848a84fc25fe348aa40 (patch) | |
| tree | 6e25e8b25b414ebd130bc93002ca6381e84206e7 /sql/slave.cc | |
| parent | c01a9fc22bbe40dbe36fe31c2d960d81119392d3 (diff) | |
| parent | a923940cf1397803aaa6886c363e5e8736605a34 (diff) | |
| download | mariadb-git-a46f4cf4975a60ff6d8d2848a84fc25fe348aa40.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
sql/field.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 1d5281ce55a..46b028cc431 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2435,7 +2435,7 @@ static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type) thd->client_capabilities = 0; my_net_init(&thd->net, 0); thd->net.read_timeout = slave_net_timeout; - thd->master_access= ~0; + thd->master_access= ~(ulong)0; thd->slave_thread = 1; set_slave_thread_options(thd); /* |