diff options
| author | unknown <aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi> | 2007-05-29 21:21:13 +0300 |
|---|---|---|
| committer | unknown <aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi> | 2007-05-29 21:21:13 +0300 |
| commit | f3734099d21659003037564d0051204a69cc69b3 (patch) | |
| tree | 19dcb28c48bd3a66363f8679f5c1e3188fadf938 /sql/sql_insert.cc | |
| parent | 4ecc9035495fe963bf63600571abb4b687f951b6 (diff) | |
| parent | 70a530e4014d386b41998c67ebb57be583e876f4 (diff) | |
| download | mariadb-git-f3734099d21659003037564d0051204a69cc69b3.tar.gz | |
Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
sql/sql_insert.cc:
Auto merged
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 2161b961927..c5888ffa113 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -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, |