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

Fixes during review of pushed code

Browse Source 
Added back missing return in mysql_delete()


mysql-test/my_manage.c:
  Cleanup: Remove some #ifdef
mysql-test/r/drop_temp_table.result:
  Delete database that may be left from other test
mysql-test/t/drop_temp_table.test:
  Delete database that may be left from other test
sql/log.cc:
  false -> FALSE
  true -> TRUE
  Wait until readers_count is 0 (not just for a signal)
  
  NOTE: it's very likely that the way to handle readers_count is wrong.
  (We are in pthread_cond_wait freeing a mutex that is not the innermost mutex,
  which can lead to deadlocks)
  
  I will talk with Guilhem about this ASAP
sql/log_event.h:
  Remove number from last even to help future merges
  (all compilers I know of can handle this properly)
sql/sql_delete.cc:
  Add back missing RETURN (was lost in a merge)
  Indentation fixes
This commit is contained in:
unknown
2005-10-27 15:15:01 +03:00
parent bd3ec22f85
commit 2f2d0b60d4
6 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_delete.cc
View File

@@ -158,14 +158,16 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
table->sort.io_cache= (IO_CACHE *) my_malloc(sizeof(IO_CACHE),
MYF(MY_FAE | MY_ZEROFILL));
if ( !(sortorder=make_unireg_sortorder((ORDER*) order->first, &length)) ||
if (!(sortorder= make_unireg_sortorder((ORDER*) order->first,
&length)) ||
(table->sort.found_records = filesort(thd, table, sortorder, length,
select, HA_POS_ERROR,
&examined_rows))
select, HA_POS_ERROR,
&examined_rows))
== HA_POS_ERROR)
{
delete select;
free_underlaid_joins(thd, &thd->lex->select_lex);
DBUG_RETURN(TRUE);
}
/*
Filesort has already found and selected the rows we want to delete,