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
ef065349
Commit
ef065349
authored
19 years ago
by
monty@mishka.local
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0
parents
7767828b
fb7be527
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
server-tools/instance-manager/instance.h
server-tools/instance-manager/instance.h
+1
-1
sql/sql_list.h
sql/sql_list.h
+6
-1
No files found.
server-tools/instance-manager/instance.h
View file @
ef065349
...
...
@@ -42,7 +42,7 @@ class Instance
void
kill_instance
(
int
signo
);
int
is_crashed
();
void
set_crash_flag_n_wake_all
();
Instance_map
*
Instance
::
get_map
();
Instance_map
*
get_map
();
public:
enum
{
DEFAULT_SHUTDOWN_DELAY
=
35
};
...
...
This diff is collapsed.
Click to expand it.
sql/sql_list.h
View file @
ef065349
...
...
@@ -426,9 +426,14 @@ struct ilink
template
<
class
T
>
class
I_List_iterator
;
/*
WARNING: copy constructor of this class does not create a usable
copy, as its members may point at each other.
*/
class
base_ilist
{
public:
public:
struct
ilink
*
first
,
last
;
inline
void
empty
()
{
first
=
&
last
;
last
.
prev
=
&
first
;
}
base_ilist
()
{
empty
();
}
...
...
This diff is collapsed.
Click to expand it.
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