diff options
| author | unknown <tsmith@siva.hindu.god> | 2007-02-08 16:02:58 -0700 |
|---|---|---|
| committer | unknown <tsmith@siva.hindu.god> | 2007-02-08 16:02:58 -0700 |
| commit | c4fdf11e583f4837e8d649875ff11338d7d3172e (patch) | |
| tree | a0a0c89d1015641f29b2e3eb87277dd410a8e45a /sql/slave.cc | |
| parent | 094db7029ea92e7dc6c0731e5e6f19285f415536 (diff) | |
| parent | 452038579bb821a815f7a838a69a2fd5a1c0d79c (diff) | |
| download | mariadb-git-c4fdf11e583f4837e8d649875ff11338d7d3172e.tar.gz | |
Merge siva.hindu.god:/home/tsmith/m/bk/51
into siva.hindu.god:/home/tsmith/m/bk/maint/51
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_select.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 6f3c5926023..f2bd24bd05e 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1296,7 +1296,7 @@ bool show_master_info(THD* thd, MASTER_INFO* mi) rpl_filter->get_wild_ignore_table(&tmp); protocol->store(&tmp); - protocol->store((uint32) mi->rli.last_slave_errno); + protocol->store(mi->rli.last_slave_errno); protocol->store(mi->rli.last_slave_error, &my_charset_bin); protocol->store((uint32) mi->rli.slave_skip_counter); protocol->store((ulonglong) mi->rli.group_master_log_pos); |