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 debian.(none):/M51/mysql-5.1

Browse Source 
into  debian.(none):/M51/push-5.1


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/mysqld.cc:
  Merge conflict - main tree has precedence.
This commit is contained in:
unknown
2007-04-20 11:58:56 +02:00
parent dfd0dbcf30 9340cb193e
commit 41bd9d455c
132 changed files with 2574 additions and 1119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_delete.cc
View File

@@ -353,7 +353,7 @@ cleanup:
}
}
if (!transactional_table)
thd->options|=OPTION_STATUS_NO_TRANS_UPDATE;
thd->no_trans_update.all= TRUE;
}
free_underlaid_joins(thd, select_lex);
if (transactional_table)
@@ -856,7 +856,7 @@ bool multi_delete::send_eof()
}
}
if (!transactional_tables)
thd->options|=OPTION_STATUS_NO_TRANS_UPDATE;
thd->no_trans_update.all= TRUE;
}
/* Commit or rollback the current SQL statement */
if (transactional_tables)