mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 14:02:32 +01:00
Merge branches/innodb+ from SVN
This commit is contained in:
commit
d655e2aee1
3 changed files with 3 additions and 3 deletions
|
@ -2281,7 +2281,7 @@ mem_free_and_error:
|
|||
}
|
||||
|
||||
sql_print_error("InnoDB: invalid value "
|
||||
"innodb_file_format_check=%s",
|
||||
"innodb_change_buffering=%s",
|
||||
innobase_change_buffering);
|
||||
goto mem_free_and_error;
|
||||
}
|
||||
|
|
|
@ -115,7 +115,7 @@ if we are compiling on Windows. */
|
|||
|
||||
/* Include <sys/stat.h> to get S_I... macros defined for os0file.c */
|
||||
# include <sys/stat.h>
|
||||
# if !defined(__NETWARE__) && !defined(__WIN__)
|
||||
# if !defined(__NETWARE__) && !defined(__WIN__)
|
||||
# include <sys/mman.h> /* mmap() for os0proc.c */
|
||||
# endif
|
||||
|
||||
|
|
|
@ -847,7 +847,7 @@ trx_commit_off_kernel(
|
|||
recovery i.e.: back ground rollback thread is still active
|
||||
then there is a chance that the rollback thread may see
|
||||
this trx as COMMITTED_IN_MEMORY and goes adhead to clean it
|
||||
up calling trx_cleanup_at_db_startup(). This can happen
|
||||
up calling trx_cleanup_at_db_startup(). This can happen
|
||||
in the case we are committing a trx here that is left in
|
||||
PREPARED state during the crash. Note that commit of the
|
||||
rollback of a PREPARED trx happens in the recovery thread
|
||||
|
|
Loading…
Reference in a new issue