mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-4398 - remove incorrect fix, replace with correct one - change default to OFF for innodb_use_fallocate

Browse source
This commit is contained in:
Vladislav Vaintroub 2013-04-19 14:52:05 +02:00
parent 71c211d48b
commit 305e3dea0d
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mysql-test/suite/sys_vars/r/innodb_use_fallocate_basic.result
View file

@ -1,20 +1,20 @@
select @@global.innodb_use_fallocate; select @@global.innodb_use_fallocate;
@@global.innodb_use_fallocate @@global.innodb_use_fallocate
1 0
select @@session.innodb_use_fallocate; select @@session.innodb_use_fallocate;
ERROR HY000: Variable 'innodb_use_fallocate' is a GLOBAL variable ERROR HY000: Variable 'innodb_use_fallocate' is a GLOBAL variable
show global variables like 'innodb_use_fallocate'; show global variables like 'innodb_use_fallocate';
Variable_name Value Variable_name Value
innodb_use_fallocate ON innodb_use_fallocate OFF
show session variables like 'innodb_use_fallocate'; show session variables like 'innodb_use_fallocate';
Variable_name Value Variable_name Value
innodb_use_fallocate ON innodb_use_fallocate OFF
select * from information_schema.global_variables where variable_name='innodb_use_fallocate'; select * from information_schema.global_variables where variable_name='innodb_use_fallocate';
VARIABLE_NAME VARIABLE_VALUE VARIABLE_NAME VARIABLE_VALUE
INNODB_USE_FALLOCATE ON INNODB_USE_FALLOCATE OFF
select * from information_schema.session_variables where variable_name='innodb_use_fallocate'; select * from information_schema.session_variables where variable_name='innodb_use_fallocate';
VARIABLE_NAME VARIABLE_VALUE VARIABLE_NAME VARIABLE_VALUE
INNODB_USE_FALLOCATE ON INNODB_USE_FALLOCATE OFF
set global innodb_use_fallocate=1; set global innodb_use_fallocate=1;
ERROR HY000: Variable 'innodb_use_fallocate' is a read only variable ERROR HY000: Variable 'innodb_use_fallocate' is a read only variable
set session innodb_use_fallocate=1; set session innodb_use_fallocate=1;

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

@ -2492,7 +2492,7 @@ innobase_change_buffering_inited_ok:
innobase_commit_concurrency_init_default(); innobase_commit_concurrency_init_default();
#ifdef HAVE_POSIX_FALLOCATE #ifdef HAVE_POSIX_FALLOCATE
srv_use_posix_fallocate = 0 && (ibool) innobase_use_fallocate; srv_use_posix_fallocate = (ibool) innobase_use_fallocate;
#endif #endif
srv_use_atomic_writes = (ibool) innobase_use_atomic_writes; srv_use_atomic_writes = (ibool) innobase_use_atomic_writes;
if (innobase_use_atomic_writes) { if (innobase_use_atomic_writes) {
@ -11567,7 +11567,7 @@ static MYSQL_SYSVAR_BOOL(use_atomic_writes, innobase_use_atomic_writes,
static MYSQL_SYSVAR_BOOL(use_fallocate, innobase_use_fallocate, static MYSQL_SYSVAR_BOOL(use_fallocate, innobase_use_fallocate,
PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY, PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
"Preallocate files fast, using operating system functionality. On POSIX systems, posix_fallocate system call is used.", "Preallocate files fast, using operating system functionality. On POSIX systems, posix_fallocate system call is used.",
NULL, NULL, TRUE); NULL, NULL, FALSE);
static MYSQL_SYSVAR_ULONG(io_capacity, srv_io_capacity, static MYSQL_SYSVAR_ULONG(io_capacity, srv_io_capacity,
PLUGIN_VAR_RQCMDARG, PLUGIN_VAR_RQCMDARG,

4
storage/xtradb/handler/ha_innodb.cc
View file

@ -3082,7 +3082,7 @@ innobase_change_buffering_inited_ok:
#endif #endif
#ifdef HAVE_POSIX_FALLOCATE #ifdef HAVE_POSIX_FALLOCATE
srv_use_posix_fallocate = 0 && (ibool) innobase_use_fallocate; srv_use_posix_fallocate = (ibool) innobase_use_fallocate;
#endif #endif
srv_use_atomic_writes = (ibool) innobase_use_atomic_writes; srv_use_atomic_writes = (ibool) innobase_use_atomic_writes;
if (innobase_use_atomic_writes) { if (innobase_use_atomic_writes) {
@ -12817,7 +12817,7 @@ static MYSQL_SYSVAR_BOOL(use_atomic_writes, innobase_use_atomic_writes,
static MYSQL_SYSVAR_BOOL(use_fallocate, innobase_use_fallocate, static MYSQL_SYSVAR_BOOL(use_fallocate, innobase_use_fallocate,
PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY, PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
"Preallocate files fast, using operating system functionality. On POSIX systems, posix_fallocate system call is used.", "Preallocate files fast, using operating system functionality. On POSIX systems, posix_fallocate system call is used.",
NULL, NULL, TRUE); NULL, NULL, FALSE);
static MYSQL_SYSVAR_ULONG(io_capacity, srv_io_capacity, static MYSQL_SYSVAR_ULONG(io_capacity, srv_io_capacity,
PLUGIN_VAR_RQCMDARG, PLUGIN_VAR_RQCMDARG,