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

merge

Browse Source 
include/my_sys.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
innobase/btr/btr0cur.c:
  Use local file
scripts/make_binary_distribution.sh:
  Add mysql_waitpid
sql/mysqld.cc:
  Simple cleanup
This commit is contained in:
unknown
2003-01-28 09:02:51 +02:00
parent 3595556335 88b405c4e2
commit c97ddd06f4
121 changed files with 7065 additions and 64246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/log.cc
View File

@ -96,9 +96,16 @@ MYSQL_LOG::MYSQL_LOG()
MYSQL_LOG::~MYSQL_LOG()
{
cleanup();
}
void MYSQL_LOG::cleanup()
{
if (inited)
{
close(1);
inited= 0;
(void) pthread_mutex_destroy(&LOCK_log);
(void) pthread_mutex_destroy(&LOCK_index);
(void) pthread_cond_destroy(&update_cond);
@ -1063,7 +1070,7 @@ bool MYSQL_LOG::write(Log_event* event_info)
if (thd->last_insert_id_used)
{
Intvar_log_event e(thd,(uchar) LAST_INSERT_ID_EVENT,
thd->last_insert_id);
thd->current_insert_id);
e.set_log_pos(this);
if (thd->server_id)
e.server_id = thd->server_id;
@ -1430,6 +1437,10 @@ void MYSQL_LOG:: wait_for_update(THD* thd)
at once after close, in which case we don't want to
close the index file.
We only write a 'stop' event to the log if exiting is set
NOTES
One can do an open on the object at once after doing a close.
The internal structures are not freed until cleanup() is called
*/
void MYSQL_LOG::close(bool exiting)