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
9c1fffab
Commit
9c1fffab
authored
Sep 08, 2010
by
Alexey Botchkov
Browse files
Options
Browse Files
Download
Plain Diff
merging.
parents
406c5a17
3886c3a4
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
5 deletions
+11
-5
libmysqld/lib_sql.cc
libmysqld/lib_sql.cc
+4
-0
sql/derror.cc
sql/derror.cc
+2
-0
sql/mysqld.cc
sql/mysqld.cc
+1
-0
sql/set_var.cc
sql/set_var.cc
+1
-1
sql/set_var.h
sql/set_var.h
+2
-3
sql/sys_vars.h
sql/sys_vars.h
+1
-1
No files found.
libmysqld/lib_sql.cc
View file @
9c1fffab
...
@@ -481,6 +481,10 @@ int init_embedded_server(int argc, char **argv, char **groups)
...
@@ -481,6 +481,10 @@ int init_embedded_server(int argc, char **argv, char **groups)
char
*
fake_argv
[]
=
{
(
char
*
)
""
,
0
};
char
*
fake_argv
[]
=
{
(
char
*
)
""
,
0
};
const
char
*
fake_groups
[]
=
{
"server"
,
"embedded"
,
0
};
const
char
*
fake_groups
[]
=
{
"server"
,
"embedded"
,
0
};
my_bool
acl_error
;
my_bool
acl_error
;
if
(
my_thread_init
())
return
1
;
if
(
argc
)
if
(
argc
)
{
{
argcp
=
&
argc
;
argcp
=
&
argc
;
...
...
sql/derror.cc
View file @
9c1fffab
...
@@ -35,6 +35,8 @@ static void init_myfunc_errs(void);
...
@@ -35,6 +35,8 @@ static void init_myfunc_errs(void);
C_MODE_START
C_MODE_START
static
const
char
**
get_server_errmsgs
()
static
const
char
**
get_server_errmsgs
()
{
{
if
(
!
current_thd
)
return
DEFAULT_ERRMSGS
;
return
CURRENT_THD_ERRMSGS
;
return
CURRENT_THD_ERRMSGS
;
}
}
C_MODE_END
C_MODE_END
...
...
sql/mysqld.cc
View file @
9c1fffab
...
@@ -1486,6 +1486,7 @@ void clean_up(bool print_message)
...
@@ -1486,6 +1486,7 @@ void clean_up(bool print_message)
cleanup_errmsgs
();
cleanup_errmsgs
();
MYSQL_CALLBACK
(
thread_scheduler
,
end
,
());
MYSQL_CALLBACK
(
thread_scheduler
,
end
,
());
finish_client_errs
();
finish_client_errs
();
(
void
)
my_error_unregister
(
ER_ERROR_FIRST
,
ER_ERROR_LAST
);
// finish server errs
DBUG_PRINT
(
"quit"
,
(
"Error messages freed"
));
DBUG_PRINT
(
"quit"
,
(
"Error messages freed"
));
/* Tell main we are ready */
/* Tell main we are ready */
logger
.
cleanup_end
();
logger
.
cleanup_end
();
...
...
sql/set_var.cc
View file @
9c1fffab
...
@@ -108,7 +108,7 @@ void sys_var_end()
...
@@ -108,7 +108,7 @@ void sys_var_end()
my_hash_free
(
&
system_variable_hash
);
my_hash_free
(
&
system_variable_hash
);
for
(
sys_var
*
var
=
all_sys_vars
.
first
;
var
;
var
=
var
->
next
)
for
(
sys_var
*
var
=
all_sys_vars
.
first
;
var
;
var
=
var
->
next
)
var
->
~
sys_var
();
var
->
cleanup
();
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
}
}
...
...
sql/set_var.h
View file @
9c1fffab
...
@@ -92,10 +92,9 @@ class sys_var
...
@@ -92,10 +92,9 @@ class sys_var
on_check_function
on_check_func
,
on_update_function
on_update_func
,
on_check_function
on_check_func
,
on_update_function
on_update_func
,
uint
deprecated_version
,
const
char
*
substitute
,
int
parse_flag
);
uint
deprecated_version
,
const
char
*
substitute
,
int
parse_flag
);
/**
/**
The instance should only be destroyed on shutdown, as it doesn't unlink
All the cleanup procedures should be performed here
itself from the chain.
*/
*/
virtual
~
sys_var
()
{}
virtual
void
cleanup
()
{}
/**
/**
downcast for sys_var_pluginvar. Returns this if it's an instance
downcast for sys_var_pluginvar. Returns this if it's an instance
of sys_var_pluginvar, and 0 otherwise.
of sys_var_pluginvar, and 0 otherwise.
...
...
sql/sys_vars.h
View file @
9c1fffab
...
@@ -385,7 +385,7 @@ class Sys_var_charptr: public sys_var
...
@@ -385,7 +385,7 @@ class Sys_var_charptr: public sys_var
DBUG_ASSERT
(
scope
()
==
GLOBAL
);
DBUG_ASSERT
(
scope
()
==
GLOBAL
);
DBUG_ASSERT
(
size
==
sizeof
(
char
*
));
DBUG_ASSERT
(
size
==
sizeof
(
char
*
));
}
}
~
Sys_var_charptr
()
void
cleanup
()
{
{
if
(
flags
&
ALLOCATED
)
if
(
flags
&
ALLOCATED
)
my_free
(
global_var
(
char
*
));
my_free
(
global_var
(
char
*
));
...
...
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