diff options
| author | brian@zim.(none) <> | 2005-06-01 21:56:30 -0700 |
|---|---|---|
| committer | brian@zim.(none) <> | 2005-06-01 21:56:30 -0700 |
| commit | 113a99626d3debba5b5c7c574f20734ae8c025de (patch) | |
| tree | 21533890f530ab28e8f4542b5f7ca2deada7e9da /sql/repl_failsafe.cc | |
| parent | b884660a8366ce689efe3f6f135afb753a499fe7 (diff) | |
| parent | efb5ed5bab9699731c47894a6a1e805a303f6b37 (diff) | |
| download | mariadb-git-113a99626d3debba5b5c7c574f20734ae8c025de.tar.gz | |
Merge of 4.1->5.0. This contained the fixes for GCC 4.0
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index de4ad83fdbb..0b6e44c0272 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -71,7 +71,7 @@ static int init_failsafe_rpl_thread(THD* thd) my_net_init(&thd->net, 0); thd->net.read_timeout = slave_net_timeout; thd->max_client_packet_length=thd->net.max_packet; - thd->master_access= ~0; + thd->master_access= ~(ulong)0; thd->priv_user = 0; pthread_mutex_lock(&LOCK_thread_count); thd->thread_id = thread_id++; |