Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl

into  mysql.com:/home/bk/b19066-mysql-5.1-new


mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
This commit is contained in:
unknown 2006-06-13 22:09:59 +02:00
commit a8c24bf75e
37 changed files with 865 additions and 212 deletions

View file

@ -1395,6 +1395,10 @@ public:
{
current_stmt_binlog_row_based= TRUE;
}
inline void clear_current_stmt_binlog_row_based()
{
current_stmt_binlog_row_based= FALSE;
}
#endif
inline void reset_current_stmt_binlog_row_based()
{
@ -1405,7 +1409,6 @@ public:
current_stmt_binlog_row_based= FALSE;
#endif
}
#endif /*HAVE_ROW_BASED_REPLICATION*/
};