database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge gleb.loc:/home/uchum/work/bk/5.1

Browse Source 
into  gleb.loc:/home/uchum/work/bk/5.1-opt


sql/item.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
mysql-test/r/rpl_change_master.result:
  Merge with 5.1.
mysql-test/t/rpl_change_master.test:
  Merge with 5.1.
sql/sql_acl.cc:
  Merge with 5.1.
This commit is contained in:
unknown
2007-06-25 03:40:30 +05:00
parent 81d32154d2 1ba9b0a9f1
commit 362852ba80
37 changed files with 617 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_class.cc
View File

@@ -3076,15 +3076,6 @@ int THD::binlog_flush_pending_rows_event(bool stmt_end)
}
void THD::binlog_delete_pending_rows_event()
{
if (Rows_log_event *pending= binlog_get_pending_rows_event())
{
delete pending;
binlog_set_pending_rows_event(0);
}
}
/*
Member function that will log query, either row-based or
statement-based depending on the value of the 'current_stmt_binlog_row_based'