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 dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0

Browse Source 
into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0


sql/sql_insert.cc:
  Auto merged
This commit is contained in:
unknown
2007-05-29 21:21:13 +03:00
parent 4ecc903549 70a530e401
commit f3734099d2
3 changed files with 58 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_insert.cc
View File

@@ -871,7 +871,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
routines did not result in any error due to the KILLED. In
such case the flag is ignored for constructing binlog event.
*/
assert(thd->killed != THD::KILL_BAD_DATA || error > 0);
DBUG_ASSERT(thd->killed != THD::KILL_BAD_DATA || error > 0);
if (thd->binlog_query(THD::ROW_QUERY_TYPE,
thd->query, thd->query_length,
transactional_table, FALSE,