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

29
storage/innobase/handler/ha_innodb.cc
View file

@ -1380,14 +1380,11 @@ innobase_drop_database(
the path is used as the database name:
for example, in 'mysql/data/test' the
database name is 'test' */
/*******************************************************************//**
Closes an InnoDB database. */
/** Shut down the InnoDB storage engine.
@return 0 */
static
int
innobase_end(
/*=========*/
handlerton* hton, /* in: Innodb handlerton */
ha_panic_function type);
innobase_end(handlerton*, ha_panic_function);
/*****************************************************************//**
Creates an InnoDB transaction struct for the thd if it does not yet have one.
@ -4011,21 +4008,13 @@ error:
DBUG_RETURN(TRUE);
}
/*******************************************************************//**
Closes an InnoDB database.
@return TRUE if error */
/** Shut down the InnoDB storage engine.
@return 0 */
static
int
innobase_end(
/*=========*/
handlerton* hton, /*!< in/out: InnoDB handlerton */
ha_panic_function type MY_ATTRIBUTE((unused)))
/*!< in: ha_panic() parameter */
innobase_end(handlerton*, ha_panic_function)
{
int err= 0;
DBUG_ENTER("innobase_end");
DBUG_ASSERT(hton == innodb_hton_ptr);
if (innodb_inited) {
@ -4042,9 +4031,7 @@ innobase_end(
innodb_inited = 0;
hash_table_free(innobase_open_tables);
innobase_open_tables = NULL;
if (innobase_shutdown_for_mysql() != DB_SUCCESS) {
err = 1;
}
innodb_shutdown();
srv_free_paths_and_sizes();
my_free(internal_innobase_data_file_path);
mysql_mutex_destroy(&innobase_share_mutex);
@ -4053,7 +4040,7 @@ innobase_end(
mysql_mutex_destroy(&pending_checkpoint_mutex);
}
DBUG_RETURN(err);
DBUG_RETURN(0);
}
/****************************************************************//**