After merge fixes

extra/resolveip.c:
  After merge fix
mysql-test/mysql-test-run.sh:
  Fixed comment
mysql-test/r/rpl_trunc_binlog.result:
  Updated results
sql/log_event.cc:
  Better (shorter) error message
This commit is contained in:
unknown 2003-10-07 00:23:29 +03:00
commit bc4a57f01a
4 changed files with 8 additions and 7 deletions

View file

@ -1041,7 +1041,7 @@ EOF
mysql_start ()
{
# We should not start the daemon here as we don't know the argumens
# We should not start the daemon here as we don't know the arguments
# for the test. Better to let the test start the daemon
# $ECHO "Starting MySQL daemon"