bk commit into 6.0 tree (mats:1.2761) BUG#33055

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
6.0 repository of mats. When mats does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-19 12:25:09+01:00, mats@stripped +2 -0
  BUG#33055 ():
  
  Minor changes done for failing tests.

  mysql-test/t/rpl_mysqldump_slave.test@stripped, 2007-12-19 12:25:03+01:00, mats@stripped +3 -3
    Test was writing to the current directory, which might not be writable.
    Changed test to write the the var directory, which is writable.

  sql/log_event.cc@stripped, 2007-12-19 12:25:03+01:00, mats@stripped +1 -1
    Correcting assertion that was too strong. Now 0 bytes of row data
    can actually be written.

diff -Nrup a/mysql-test/t/rpl_mysqldump_slave.test b/mysql-test/t/rpl_mysqldump_slave.test
--- a/mysql-test/t/rpl_mysqldump_slave.test	2007-10-16 19:28:34 +02:00
+++ b/mysql-test/t/rpl_mysqldump_slave.test	2007-12-19 12:25:03 +01:00
@@ -9,10 +9,10 @@ use test;
 connection slave;
 
 # Execute mysqldump with --dump-slave
---exec $MYSQL_DUMP_SLAVE --compact --dump-slave test > dump.txt
+--exec $MYSQL_DUMP_SLAVE --compact --dump-slave test > $MYSQLTEST_VARDIR/tmp/dump.txt
 
 # Execute mysqldump with --dump-slave and --apply-slave-statements 
---exec $MYSQL_DUMP_SLAVE --compact --dump-slave --apply-slave-statements test >> dump.txt
+--exec $MYSQL_DUMP_SLAVE --compact --dump-slave --apply-slave-statements test >> $MYSQLTEST_VARDIR/tmp/dump.txt
 
 # Execute mysqldump with --dump-slave ,--apply-slave-statements and --include-master-host-port
---exec $MYSQL_DUMP_SLAVE --compact --dump-slave --apply-slave-statements --include-master-host-port test >> dump.txt
+--exec $MYSQL_DUMP_SLAVE --compact --dump-slave --apply-slave-statements --include-master-host-port test >> $MYSQLTEST_VARDIR/tmp/dump.txt
diff -Nrup a/sql/log_event.cc b/sql/log_event.cc
--- a/sql/log_event.cc	2007-12-18 18:26:44 +01:00
+++ b/sql/log_event.cc	2007-12-19 12:25:03 +01:00
@@ -6122,7 +6122,7 @@ int Rows_log_event::do_add_row_data(ucha
 #endif
 
   DBUG_ASSERT(m_rows_buf <= m_rows_cur);
-  DBUG_ASSERT(!m_rows_buf || m_rows_end && m_rows_buf < m_rows_end);
+  DBUG_ASSERT(!m_rows_buf || m_rows_end && m_rows_buf <= m_rows_end);
   DBUG_ASSERT(m_rows_cur <= m_rows_end);
 
   /* The cast will always work since m_rows_cur <= m_rows_end */