Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
fe7c95ec
Commit
fe7c95ec
authored
Sep 26, 2022
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup: Declare srv_shutdown_bg_undo_sources() static
parent
6286a05d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
21 deletions
+21
-21
storage/innobase/include/srv0start.h
storage/innobase/include/srv0start.h
+1
-4
storage/innobase/srv/srv0start.cc
storage/innobase/srv/srv0start.cc
+20
-17
No files found.
storage/innobase/include/srv0start.h
View file @
fe7c95ec
/*****************************************************************************
/*****************************************************************************
Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2017, 202
0
, MariaDB Corporation.
Copyright (c) 2017, 202
2
, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
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
the terms of the GNU General Public License as published by the Free Software
...
@@ -52,9 +52,6 @@ void innodb_preshutdown();
...
@@ -52,9 +52,6 @@ void innodb_preshutdown();
/** Shut down InnoDB. */
/** Shut down InnoDB. */
void
innodb_shutdown
();
void
innodb_shutdown
();
/** Shut down background threads that can generate undo log. */
void
srv_shutdown_bg_undo_sources
();
/*************************************************************//**
/*************************************************************//**
Copy the file path component of the physical file to parameter. It will
Copy the file path component of the physical file to parameter. It will
copy up to and including the terminating path separator.
copy up to and including the terminating path separator.
...
...
storage/innobase/srv/srv0start.cc
View file @
fe7c95ec
...
@@ -848,6 +848,26 @@ static void srv_shutdown_threads()
...
@@ -848,6 +848,26 @@ static void srv_shutdown_threads()
}
}
}
}
/** Shut down background threads that can generate undo log. */
static
void
srv_shutdown_bg_undo_sources
()
{
srv_shutdown_state
=
SRV_SHUTDOWN_INITIATED
;
if
(
srv_undo_sources
)
{
ut_ad
(
!
srv_read_only_mode
);
fts_optimize_shutdown
();
dict_stats_shutdown
();
while
(
row_get_background_drop_list_len_low
())
{
srv_inc_activity_count
();
os_thread_yield
();
}
srv_undo_sources
=
false
;
}
}
#ifdef UNIV_DEBUG
#ifdef UNIV_DEBUG
# define srv_init_abort(_db_err) \
# define srv_init_abort(_db_err) \
srv_init_abort_low(create_new_db, __FILE__, __LINE__, _db_err)
srv_init_abort_low(create_new_db, __FILE__, __LINE__, _db_err)
...
@@ -1953,23 +1973,6 @@ dberr_t srv_start(bool create_new_db)
...
@@ -1953,23 +1973,6 @@ dberr_t srv_start(bool create_new_db)
return
(
DB_SUCCESS
);
return
(
DB_SUCCESS
);
}
}
/** Shut down background threads that can generate undo log. */
void
srv_shutdown_bg_undo_sources
()
{
srv_shutdown_state
=
SRV_SHUTDOWN_INITIATED
;
if
(
srv_undo_sources
)
{
ut_ad
(
!
srv_read_only_mode
);
fts_optimize_shutdown
();
dict_stats_shutdown
();
while
(
row_get_background_drop_list_len_low
())
{
srv_inc_activity_count
();
os_thread_yield
();
}
srv_undo_sources
=
false
;
}
}
/**
/**
Shutdown purge to make sure that there is no possibility that we call any
Shutdown purge to make sure that there is no possibility that we call any
plugin code (e.g., audit) inside virtual column computation.
plugin code (e.g., audit) inside virtual column computation.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment