diff options
author | unknown <paul@ice.snake.net> | 2003-11-20 21:16:45 -0600 |
---|---|---|
committer | unknown <paul@ice.snake.net> | 2003-11-20 21:16:45 -0600 |
commit | de035068d6dc1f6b126aff4dab7f911dd35144b2 (patch) | |
tree | f2eeb7a0a664a31f9501f6e5c189eb8c5fbe39ab /sql/repl_failsafe.cc | |
parent | de2eee1da5af0c72760fdf3a4b6d0f4a41359a64 (diff) | |
parent | c3cce96ed3db5fad372b368271e6c38a7c18bc78 (diff) | |
download | mariadb-git-de035068d6dc1f6b126aff4dab7f911dd35144b2.tar.gz |
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Users/paul/mysql-4.1
mysql-test/r/rpl_loaddata.result:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
Diffstat (limited to 'sql/repl_failsafe.cc')
-rw-r--r-- | sql/repl_failsafe.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 4ff08fd1d14..0d2da91e015 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -623,7 +623,6 @@ err: int show_slave_hosts(THD* thd) { List<Item> field_list; - NET* net = &thd->net; Protocol *protocol= thd->protocol; DBUG_ENTER("show_slave_hosts"); |