mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.0 into 10.1

Browse source
This commit is contained in:
Marko Mäkelä 2017-06-12 14:26:32 +03:00
commit fa57479fcd
25 changed files with 373 additions and 447 deletions
Download patch file Download diff file Expand all files Collapse all files

2
storage/innobase/include/buf0flu.h
View file

@ -35,7 +35,7 @@ Created 11/5/1995 Heikki Tuuri
#include "buf0types.h"
/** Flag indicating if the page_cleaner is in active state. */
extern ibool buf_page_cleaner_is_active;
extern bool buf_page_cleaner_is_active;
/** Event to synchronise with the flushing. */
extern os_event_t buf_flush_event;

6
storage/innobase/include/dict0stats_bg.h
View file

@ -1,7 +1,7 @@
/*****************************************************************************
Copyright (c) 2012, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2017, MariaDB Corporation. All Rights Reserved.
Copyright (c) 2017, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@ -144,6 +144,10 @@ DECLARE_THREAD(dict_stats_thread)(
void* arg); /*!< in: a dummy parameter
required by os_thread_create */
/** Shut down the dict_stats_thread. */
void
dict_stats_shutdown();
# ifndef UNIV_NONINL
# include "dict0stats_bg.ic"
# endif

20
storage/innobase/include/srv0start.h
View file

@ -1,6 +1,7 @@
/*****************************************************************************
Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2017, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@ -76,22 +77,12 @@ are not found and the user wants.
@return DB_SUCCESS or error code */
UNIV_INTERN
dberr_t
innobase_start_or_create_for_mysql(void);
/*====================================*/
/****************************************************************//**
Shuts down the Innobase database.
@return DB_SUCCESS or error code */
UNIV_INTERN
dberr_t
innobase_shutdown_for_mysql(void);
innobase_start_or_create_for_mysql();
/********************************************************************
Signal all per-table background threads to shutdown, and wait for them to do
so. */
/** Shut down InnoDB. */
UNIV_INTERN
void
srv_shutdown_table_bg_threads(void);
/*=============================*/
innodb_shutdown();
/*************************************************************//**
Copy the file path component of the physical file to parameter. It will
@ -159,6 +150,9 @@ enum srv_shutdown_state {
SRV_SHUTDOWN_EXIT_THREADS/*!< Exit all threads */
};
/** Whether any undo log records can be generated */
extern bool srv_undo_sources;
/** At a shutdown this value climbs from SRV_SHUTDOWN_NONE to
SRV_SHUTDOWN_CLEANUP and then to SRV_SHUTDOWN_LAST_PHASE, and so on */
extern enum srv_shutdown_state srv_shutdown_state;