database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
monty@mashka.mysql.fi
2002-08-08 03:29:36 +03:00
parent a4b77125fd 2c4fa340cc
commit 1bb7665a9c
225 changed files with 5972 additions and 6158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_update.cc
View File

@@ -307,7 +307,8 @@ int mysql_update(THD *thd,
mysql_update_log.write(thd,thd->query,thd->query_length);
if (mysql_bin_log.is_open())
{
Query_log_event qinfo(thd, thd->query, using_transactions);
Query_log_event qinfo(thd, thd->query, thd->query_length,
using_transactions);
if (mysql_bin_log.write(&qinfo) && using_transactions)
error=1;
}
@@ -789,7 +790,7 @@ bool multi_update::send_eof()
if (updated || not_trans_safe)
{
mysql_update_log.write(thd,thd->query,thd->query_length);
Query_log_event qinfo(thd, thd->query);
Query_log_event qinfo(thd, thd->query, thd->query_length);
/*
mysql_bin_log is not open if binlogging or replication