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

Merge mysql.com:/home/jimw/my/mysql-4.1-clean

Browse Source 
into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/bdb.result:
  Resolve conflicts
mysql-test/t/bdb.test:
  Resolve conflicts
sql/sql_delete.cc:
  Resolve conflicts
sql/sql_insert.cc:
  Resolve conflicts
sql/sql_update.cc:
  Resolve conflicts
This commit is contained in:
unknown
2005-12-12 10:11:56 -08:00
parent 95cabee1dc ab597139a7
commit d6e5fdf08a
6 changed files with 50 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_update.cc
View File

@@ -527,6 +527,7 @@ int mysql_update(THD *thd,
if (!transactional_table)
thd->options|=OPTION_STATUS_NO_TRANS_UPDATE;
}
free_underlaid_joins(thd, select_lex);
if (transactional_table)
{
if (ha_autocommit_or_rollback(thd, error >= 0))
@@ -539,7 +540,6 @@ int mysql_update(THD *thd,
thd->lock=0;
}
free_underlaid_joins(thd, select_lex);
if (error < 0)
{
char buff[STRING_BUFFER_USUAL_SIZE];