database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Fixes after merge with 4.0

Browse Source 
mysql-test/r/heap_btree.result:
  Updated results
mysql-test/r/heap_hash.result:
  Updated results
mysql-test/r/merge.result:
  Updated results
mysql-test/r/rpl_log.result:
  Updated results
mysql-test/r/select.result:
  Updated results
mysql-test/r/subselect.result:
  Updated results
sql/item_cmpfunc.h:
  Fix after merge
sql/log_event.cc:
  Fix after merge
sql/mysql_priv.h:
  Fix after merge
sql/sql_acl.cc:
  Fix after merge
sql/sql_class.cc:
  Fix after merge
sql/sql_db.cc:
  Fix after merge
sql/sql_delete.cc:
  Fix after merge
sql/sql_lex.cc:
  Fix after merge
sql/sql_lex.h:
  Fix after merge
sql/sql_parse.cc:
  Fix after merge
sql/sql_update.cc:
  Fix after merge
sql/sql_yacc.yy:
  Fix after merge
This commit is contained in:
unknown
2002-11-21 22:25:53 +02:00
parent 33fc0d53b5
commit c58d9d9a9d
18 changed files with 76 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_delete.cc
View File

@@ -35,7 +35,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order,
SQL_SELECT *select=0;
READ_RECORD info;
bool using_limit=limit != HA_POS_ERROR;
bool using_transactions, log_delayed, safe_update, const_cond;
bool transactional_table, log_delayed, safe_update, const_cond;
ha_rows deleted;
DBUG_ENTER("mysql_delete");