mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-02 13:15:32 +02:00
Code Issues Projects Releases Packages Wiki 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
commit 2f2d0b60d4
6 changed files with 26 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sql/log.cc
View file

@ -358,7 +358,7 @@ MYSQL_LOG::MYSQL_LOG()
:bytes_written(0), last_time(0), query_start(0), name(0),
file_id(1), open_count(1), log_type(LOG_CLOSED), write_error(0), inited(0),
need_start_event(1), prepared_xids(0), description_event_for_exec(0),
description_event_for_queue(0), readers_count(0), reset_pending(false)
description_event_for_queue(0), readers_count(0), reset_pending(FALSE)
{
/*
We don't want to initialize LOCK_Log here as such initialization depends on
@ -965,7 +965,7 @@ bool MYSQL_LOG::reset_logs(THD* thd)
goto err;
}
reset_pending= true;
reset_pending= TRUE;
/*
send update signal just in case so that all reader threads waiting
for log update will leave wait condition
@ -975,7 +975,7 @@ bool MYSQL_LOG::reset_logs(THD* thd)
if there are active readers wait until all of them will
release opened files
*/
if (readers_count)
while (readers_count)
pthread_cond_wait(&reset_cond, &LOCK_log);
for (;;)
@ -996,7 +996,7 @@ bool MYSQL_LOG::reset_logs(THD* thd)
my_free((gptr) save_name, MYF(0));
err:
reset_pending= false;
reset_pending= FALSE;
(void) pthread_mutex_unlock(&LOCK_thread_count);
pthread_mutex_unlock(&LOCK_readers);