database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-13 02:22:51 +03:00
Code Activity

Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into  127.(none):/home/osku/mysql-5.0
This commit is contained in:
osku@127.(none)
2005-08-29 09:06:43 +03:00
parent c019e40ff0 ce22788bdd
commit caf74b7cdd
6 changed files with 106 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/sql_delete.cc
View File

@ -100,6 +100,13 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
free_underlaid_joins(thd, select_lex);
thd->row_count_func= 0;
send_ok(thd,0L);
/*
We don't need to call reset_auto_increment in this case, because
mysql_truncate always gives a NULL conds argument, hence we never
get here.
*/
DBUG_RETURN(0); // Nothing to delete
}
@ -223,6 +230,21 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
if (options & OPTION_QUICK)
(void) table->file->extra(HA_EXTRA_NORMAL);
if ((error < 0) && (thd->lex->sql_command == SQLCOM_TRUNCATE))
{
/*
We're really doing a truncate and need to reset the table's
auto-increment counter.
*/
int error2 = table->file->reset_auto_increment();
if (error2 && (error2 != HA_ERR_WRONG_COMMAND))
{
table->file->print_error(error2, MYF(0));
error = 1;
}
}
cleanup:
/*
Invalidate the table in the query cache if something changed. This must