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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
079506b5
Commit
079506b5
authored
Nov 07, 2006
by
baker@bk-internal.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
parents
a56565b8
8a56fcff
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
32 deletions
+17
-32
sql/handler.cc
sql/handler.cc
+15
-23
sql/handler.h
sql/handler.h
+1
-0
sql/mysqld.cc
sql/mysqld.cc
+1
-7
sql/set_var.cc
sql/set_var.cc
+0
-2
No files found.
sql/handler.cc
View file @
079506b5
...
...
@@ -376,11 +376,12 @@ int ha_finalize_handlerton(st_plugin_int *plugin)
case
SHOW_OPTION_YES
:
if
(
installed_htons
[
hton
->
db_type
]
==
hton
)
installed_htons
[
hton
->
db_type
]
=
NULL
;
if
(
hton
->
panic
&&
hton
->
panic
(
hton
,
HA_PANIC_CLOSE
))
DBUG_RETURN
(
1
);
break
;
};
if
(
hton
->
panic
)
hton
->
panic
(
hton
,
HA_PANIC_CLOSE
);
if
(
plugin
->
plugin
->
deinit
)
{
/*
...
...
@@ -509,31 +510,22 @@ int ha_init()
DBUG_RETURN
(
error
);
}
/*
close, flush or restart databases
Ignore this for other databases than ours
*/
static
my_bool
panic_handlerton
(
THD
*
unused1
,
st_plugin_int
*
plugin
,
void
*
arg
)
int
ha_end
()
{
handlerton
*
hton
=
(
handlerton
*
)
plugin
->
data
;
if
(
hton
->
state
==
SHOW_OPTION_YES
&&
hton
->
panic
)
((
int
*
)
arg
)[
0
]
|=
hton
->
panic
(
hton
,
(
enum
ha_panic_function
)((
int
*
)
arg
)[
1
]);
return
FALSE
;
}
int
error
=
0
;
DBUG_ENTER
(
"ha_end"
);
int
ha_panic
(
enum
ha_panic_function
flag
)
{
int
error
[
2
];
error
[
0
]
=
0
;
error
[
1
]
=
(
int
)
flag
;
plugin_foreach
(
NULL
,
panic_handlerton
,
MYSQL_STORAGE_ENGINE_PLUGIN
,
error
);
/*
This should be eventualy based on the graceful shutdown flag.
So if flag is equal to HA_PANIC_CLOSE, the deallocate
the errors.
*/
if
(
ha_finish_errors
())
error
=
1
;
if
(
flag
==
HA_PANIC_CLOSE
&&
ha_finish_errors
())
error
[
0
]
=
1
;
return
error
[
0
];
}
/* ha_panic */
DBUG_RETURN
(
error
);
}
static
my_bool
dropdb_handlerton
(
THD
*
unused1
,
st_plugin_int
*
plugin
,
void
*
path
)
...
...
sql/handler.h
View file @
079506b5
...
...
@@ -1658,6 +1658,7 @@ static inline bool ha_storage_engine_is_enabled(const handlerton *db_type)
/* basic stuff */
int
ha_init
(
void
);
int
ha_end
(
void
);
int
ha_initialize_handlerton
(
st_plugin_int
*
plugin
);
int
ha_finalize_handlerton
(
st_plugin_int
*
plugin
);
...
...
sql/mysqld.cc
View file @
079506b5
...
...
@@ -372,7 +372,6 @@ extern longlong innobase_log_file_size;
extern
long
innobase_log_buffer_size
;
extern
longlong
innobase_buffer_pool_size
;
extern
long
innobase_additional_mem_pool_size
;
extern
long
innobase_buffer_pool_awe_mem_mb
;
extern
long
innobase_file_io_threads
,
innobase_lock_wait_timeout
;
extern
long
innobase_force_recovery
;
extern
long
innobase_open_files
;
...
...
@@ -1186,7 +1185,6 @@ void clean_up(bool print_message)
lex_free
();
/* Free some memory */
set_var_free
();
free_charsets
();
(
void
)
ha_panic
(
HA_PANIC_CLOSE
);
/* close all tables and logs */
if
(
!
opt_noacl
)
{
#ifdef HAVE_DLOPEN
...
...
@@ -1194,6 +1192,7 @@ void clean_up(bool print_message)
#endif
}
plugin_shutdown
();
ha_end
();
if
(
tc_log
)
tc_log
->
close
();
xid_cache_free
();
...
...
@@ -5798,10 +5797,6 @@ log and this option does nothing anymore.",
(
gptr
*
)
&
srv_auto_extend_increment
,
(
gptr
*
)
&
srv_auto_extend_increment
,
0
,
GET_LONG
,
REQUIRED_ARG
,
8L
,
1L
,
1000L
,
0
,
1L
,
0
},
{
"innodb_buffer_pool_awe_mem_mb"
,
OPT_INNODB_BUFFER_POOL_AWE_MEM_MB
,
"If Windows AWE is used, the size of InnoDB buffer pool allocated from the AWE memory."
,
(
gptr
*
)
&
innobase_buffer_pool_awe_mem_mb
,
(
gptr
*
)
&
innobase_buffer_pool_awe_mem_mb
,
0
,
GET_LONG
,
REQUIRED_ARG
,
0
,
0
,
63000
,
0
,
1
,
0
},
{
"innodb_buffer_pool_size"
,
OPT_INNODB_BUFFER_POOL_SIZE
,
"The size of the memory buffer InnoDB uses to cache data and indexes of its tables."
,
(
gptr
*
)
&
innobase_buffer_pool_size
,
(
gptr
*
)
&
innobase_buffer_pool_size
,
0
,
...
...
@@ -8164,7 +8159,6 @@ longlong innobase_log_file_size;
long
innobase_log_buffer_size
;
longlong
innobase_buffer_pool_size
;
long
innobase_additional_mem_pool_size
;
long
innobase_buffer_pool_awe_mem_mb
;
long
innobase_file_io_threads
,
innobase_lock_wait_timeout
;
long
innobase_force_recovery
;
long
innobase_open_files
;
...
...
sql/set_var.cc
View file @
079506b5
...
...
@@ -67,7 +67,6 @@ extern longlong innobase_log_file_size;
extern
long
innobase_log_buffer_size
;
extern
longlong
innobase_buffer_pool_size
;
extern
long
innobase_additional_mem_pool_size
;
extern
long
innobase_buffer_pool_awe_mem_mb
;
extern
long
innobase_file_io_threads
,
innobase_lock_wait_timeout
;
extern
long
innobase_force_recovery
;
extern
long
innobase_open_files
;
...
...
@@ -819,7 +818,6 @@ SHOW_VAR init_vars[]= {
#ifdef WITH_INNOBASE_STORAGE_ENGINE
{
"innodb_additional_mem_pool_size"
,
(
char
*
)
&
innobase_additional_mem_pool_size
,
SHOW_LONG
},
{
sys_innodb_autoextend_increment
.
name
,
(
char
*
)
&
sys_innodb_autoextend_increment
,
SHOW_SYS
},
{
"innodb_buffer_pool_awe_mem_mb"
,
(
char
*
)
&
innobase_buffer_pool_awe_mem_mb
,
SHOW_LONG
},
{
"innodb_buffer_pool_size"
,
(
char
*
)
&
innobase_buffer_pool_size
,
SHOW_LONGLONG
},
{
"innodb_checksums"
,
(
char
*
)
&
innobase_use_checksums
,
SHOW_MY_BOOL
},
{
sys_innodb_commit_concurrency
.
name
,
(
char
*
)
&
sys_innodb_commit_concurrency
,
SHOW_SYS
},
...
...
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