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 work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql

Browse Source 
Docs/manual.texi:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
This commit is contained in:
unknown
2000-09-16 04:27:49 +03:00
parent ff1216a5a9 19b678eefe
commit 8c6b365e7d
26 changed files with 321 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_delete.cc
View File

@@ -89,9 +89,12 @@ int generate_table(THD *thd, TABLE_LIST *table_list,
if (!error)
{
send_ok(&thd->net); // This should return record count
mysql_update_log.write(thd->query,thd->query_length);
Query_log_event qinfo(thd, thd->query);
mysql_bin_log.write(&qinfo);
mysql_update_log.write(thd,thd->query,thd->query_length);
if (mysql_bin_log.is_open())
{
Query_log_event qinfo(thd, thd->query);
mysql_bin_log.write(&qinfo);
}
}
DBUG_RETURN(error ? -1 : 0);
}
@@ -188,9 +191,12 @@ int mysql_delete(THD *thd,TABLE_LIST *table_list,COND *conds,ha_rows limit,
VOID(table->file->extra(HA_EXTRA_READCHECK));
if (deleted)
{
mysql_update_log.write(thd->query, thd->query_length);
Query_log_event qinfo(thd, thd->query);
mysql_bin_log.write(&qinfo);
mysql_update_log.write(thd,thd->query, thd->query_length);
if (mysql_bin_log.is_open())
{
Query_log_event qinfo(thd, thd->query);
mysql_bin_log.write(&qinfo);
}
}
if (ha_autocommit_or_rollback(thd,error >= 0))
error=1;