database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge 10.0-base -> 10.0

Browse Source
This commit is contained in:
Igor Babaev
2013-04-20 12:30:40 -07:00
parent 30651fd2f6 1baf3d7d14
commit 6edcd45ebf
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/include/function_defaults_notembedded.inc
View File

@@ -92,3 +92,4 @@ FLUSH TABLE t1;
SELECT * FROM t1; SELECT * FROM t1;
DROP TABLE t1; DROP TABLE t1;
SET debug_sync = 'RESET';

2
mysql-test/r/function_defaults_notembedded.result
View File

@@ -85,6 +85,7 @@ a b
5 1982-03-20 20:22:34 5 1982-03-20 20:22:34
6 1982-03-20 20:22:34 6 1982-03-20 20:22:34
DROP TABLE t1; DROP TABLE t1;
SET debug_sync = 'RESET';
# #
# Function defaults run 2. Six digits scale on seconds precision. # Function defaults run 2. Six digits scale on seconds precision.
# #
@@ -169,3 +170,4 @@ a b
5 1982-03-20 20:22:34.876543 5 1982-03-20 20:22:34.876543
6 1982-03-20 20:22:34.876543 6 1982-03-20 20:22:34.876543
DROP TABLE t1; DROP TABLE t1;
SET debug_sync = 'RESET';

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

@@ -2965,7 +2965,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) {
@@ -14594,7 +14594,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) {
@@ -12798,7 +12798,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,