summaryrefslogtreecommitdiff
path: root/sql/slave.cc
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-08-13 17:59:40 +0300
committerunknown <monty@hundin.mysql.fi>2001-08-13 17:59:40 +0300
commit97250b9c40a378659c6c4423461021231a3b551d (patch)
treedf01d4e8424454fc1871d80ce81a95cab8b0da49 /sql/slave.cc
parent638a96783ecb84879df9c908384df89bceafd2a1 (diff)
downloadmariadb-git-97250b9c40a378659c6c4423461021231a3b551d.tar.gz
Cleanups
client/mysqltest.c: Made mysqltest compatible with 3.23 sql/slave.cc: Marked removable code vio/viossl.c: change to use DBUG_ASSERT
Diffstat (limited to 'sql/slave.cc')
-rw-r--r--sql/slave.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc
index e5da79d6871..27637107b11 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -664,9 +664,9 @@ int show_master_info(THD* thd)
net_store_data(packet, (longlong) glob_mi.pos);
last_log_seq = glob_mi.last_log_seq;
pthread_mutex_unlock(&glob_mi.lock);
- pthread_mutex_lock(&LOCK_slave);
+ pthread_mutex_lock(&LOCK_slave); // QQ; This is not needed
net_store_data(packet, slave_running ? "Yes":"No");
- pthread_mutex_unlock(&LOCK_slave);
+ pthread_mutex_unlock(&LOCK_slave); // QQ; This is not needed
net_store_data(packet, &replicate_do_db);
net_store_data(packet, &replicate_ignore_db);
net_store_data(packet, (uint32)last_slave_errno);