diff options
| author | monty@hundin.mysql.fi <> | 2002-08-18 16:04:26 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-08-18 16:04:26 +0300 |
| commit | a5edb200421018ee967045903b2802c2d5c1bd75 (patch) | |
| tree | af1548211472940ebe3bad8ee24a4d2ab26f2c92 /sql/sql_repl.cc | |
| parent | f7c8bd0e47b8a037f4eb0a7dca2816af97604d07 (diff) | |
| download | mariadb-git-a5edb200421018ee967045903b2802c2d5c1bd75.tar.gz | |
Fixed timing problem with rpl000001 replication test.
Fixed configure problems with HPUX and openbsd
SHOW SLAVE STATUS returns empty set if slave is not initialized
SHOW MASTER STATUS returns empty set if binary logging is not enabled.
Fixed shutdown problem on Solaris.
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 9cc596f9bb5..8975a05ac3a 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1000,18 +1000,9 @@ int show_binlog_info(THD* thd) net_store_data(packet, (longlong)li.pos); net_store_data(packet, &binlog_do_db); net_store_data(packet, &binlog_ignore_db); + if (my_net_write(&thd->net, (char*)thd->packet.ptr(), packet->length())) + DBUG_RETURN(-1); } - else - { - net_store_null(packet); - net_store_null(packet); - net_store_null(packet); - net_store_null(packet); - } - - if (my_net_write(&thd->net, (char*)thd->packet.ptr(), packet->length())) - DBUG_RETURN(-1); - send_eof(&thd->net); DBUG_RETURN(0); } |