mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 07:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-5574 Set AUTO_INCREMENT below max value of column.

Browse source 
Update InnoDB to 5.6.14
Apply MySQL-5.6 hack for MySQL Bug#16434374
Move Aria-only HA_RTREE_INDEX from my_base.h to maria_def.h (breaks an assert in InnoDB)
Fix InnoDB memory leak
This commit is contained in:
Sergei Golubchik 2014-02-01 09:33:26 +01:00
commit 27d45e4696
160 changed files with 10282 additions and 5808 deletions
Download patch file Download diff file Expand all files Collapse all files

60
storage/innobase/include/os0file.ic
View file

@ -386,4 +386,64 @@ pfs_os_file_rename_func(
return(result);
}
/***********************************************************************//**
NOTE! Please use the corresponding macro os_file_delete(), not directly
this function!
This is the performance schema instrumented wrapper function for
os_file_delete()
@return TRUE if success */
UNIV_INLINE
bool
pfs_os_file_delete_func(
/*====================*/
mysql_pfs_key_t key, /*!< in: Performance Schema Key */
const char* name, /*!< in: file path as a null-terminated
string */
const char* src_file, /*!< in: file name where func invoked */
ulint src_line) /*!< in: line where the func invoked */
{
bool result;
struct PSI_file_locker* locker = NULL;
PSI_file_locker_state state;
register_pfs_file_close_begin(&state, locker, key, PSI_FILE_DELETE,
name, src_file, src_line);
result = os_file_delete_func(name);
register_pfs_file_close_end(locker, 0);
return(result);
}
/***********************************************************************//**
NOTE! Please use the corresponding macro os_file_delete_if_exists(), not
directly this function!
This is the performance schema instrumented wrapper function for
os_file_delete_if_exists()
@return TRUE if success */
UNIV_INLINE
bool
pfs_os_file_delete_if_exists_func(
/*==============================*/
mysql_pfs_key_t key, /*!< in: Performance Schema Key */
const char* name, /*!< in: file path as a null-terminated
string */
const char* src_file, /*!< in: file name where func invoked */
ulint src_line) /*!< in: line where the func invoked */
{
bool result;
struct PSI_file_locker* locker = NULL;
PSI_file_locker_state state;
register_pfs_file_close_begin(&state, locker, key, PSI_FILE_DELETE,
name, src_file, src_line);
result = os_file_delete_if_exists_func(name);
register_pfs_file_close_end(locker, 0);
return(result);
}
#endif /* UNIV_PFS_IO */