bzr push into mysql-6.0-wl2110-review branch (marc.alff:2696 to 2697)

[Marc Alff]

 2697 Marc Alff	2008-08-27
      Re branching from mysql-6.0
modified:
  .bzr-mysql/default.conf

 2696 Sergei Golubchik	2008-08-26 [merge]
      merge 6.0->6.0-maria
added:
  mysql-test/include/mysqlbinlog_row_engine.inc
  mysql-test/r/mysqlbinlog_row.result
  mysql-test/r/mysqlbinlog_row_big.result
  mysql-test/r/mysqlbinlog_row_innodb.result
  mysql-test/r/mysqlbinlog_row_myisam.result
  mysql-test/r/mysqlbinlog_row_trans.result
  mysql-test/t/mysqlbinlog_row.test
  mysql-test/t/mysqlbinlog_row_big.test
  mysql-test/t/mysqlbinlog_row_innodb.test
  mysql-test/t/mysqlbinlog_row_myisam.test
  mysql-test/t/mysqlbinlog_row_trans.test
modified:
  .bzrignore
  client/Makefile.am
  client/mysqlbinlog.cc
  sql/log_event.cc
  sql/log_event.h
  sql/rpl_tblmap.cc
  sql/rpl_tblmap.h
  sql/rpl_utility.h
  sql/sql_base.cc

=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2008-08-21 08:18:48 +0000
+++ b/.bzr-mysql/default.conf	2008-08-27 17:14:11 +0000
@@ -1,5 +1,5 @@
 [MYSQL]
-tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0
+tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-wl2110-review
 post_commit_to = commits@stripped
 post_push_to = commits@stripped
-tree_name = mysql-6.0
+tree_name = mysql-6.0-wl2110-review