Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
6edcd45e
Commit
6edcd45e
authored
Apr 20, 2013
by
Igor Babaev
Browse files
Options
Browse Files
Download
Plain Diff
Merge 10.0-base -> 10.0
parents
30651fd2
1baf3d7d
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
9 deletions
+12
-9
mysql-test/include/function_defaults_notembedded.inc
mysql-test/include/function_defaults_notembedded.inc
+1
-0
mysql-test/r/function_defaults_notembedded.result
mysql-test/r/function_defaults_notembedded.result
+2
-0
mysql-test/suite/sys_vars/r/innodb_use_fallocate_basic.result
...l-test/suite/sys_vars/r/innodb_use_fallocate_basic.result
+5
-5
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.cc
+2
-2
storage/xtradb/handler/ha_innodb.cc
storage/xtradb/handler/ha_innodb.cc
+2
-2
No files found.
mysql-test/include/function_defaults_notembedded.inc
View file @
6edcd45e
...
...
@@ -92,3 +92,4 @@ FLUSH TABLE t1;
SELECT
*
FROM
t1
;
DROP
TABLE
t1
;
SET
debug_sync
=
'RESET'
;
mysql-test/r/function_defaults_notembedded.result
View file @
6edcd45e
...
...
@@ -85,6 +85,7 @@ a b
5 1982-03-20 20:22:34
6 1982-03-20 20:22:34
DROP TABLE t1;
SET debug_sync = 'RESET';
#
# Function defaults run 2. Six digits scale on seconds precision.
#
...
...
@@ -169,3 +170,4 @@ a b
5 1982-03-20 20:22:34.876543
6 1982-03-20 20:22:34.876543
DROP TABLE t1;
SET debug_sync = 'RESET';
mysql-test/suite/sys_vars/r/innodb_use_fallocate_basic.result
View file @
6edcd45e
select @@global.innodb_use_fallocate;
@@global.innodb_use_fallocate
1
0
select @@session.innodb_use_fallocate;
ERROR HY000: Variable 'innodb_use_fallocate' is a GLOBAL variable
show global variables like 'innodb_use_fallocate';
Variable_name Value
innodb_use_fallocate O
N
innodb_use_fallocate O
FF
show session variables like 'innodb_use_fallocate';
Variable_name Value
innodb_use_fallocate O
N
innodb_use_fallocate O
FF
select * from information_schema.global_variables where variable_name='innodb_use_fallocate';
VARIABLE_NAME VARIABLE_VALUE
INNODB_USE_FALLOCATE O
N
INNODB_USE_FALLOCATE O
FF
select * from information_schema.session_variables where variable_name='innodb_use_fallocate';
VARIABLE_NAME VARIABLE_VALUE
INNODB_USE_FALLOCATE O
N
INNODB_USE_FALLOCATE O
FF
set global innodb_use_fallocate=1;
ERROR HY000: Variable 'innodb_use_fallocate' is a read only variable
set session innodb_use_fallocate=1;
...
...
storage/innobase/handler/ha_innodb.cc
View file @
6edcd45e
...
...
@@ -2965,7 +2965,7 @@ innobase_change_buffering_inited_ok:
innobase_commit_concurrency_init_default
();
#ifdef HAVE_POSIX_FALLOCATE
srv_use_posix_fallocate
=
0
&&
(
ibool
)
innobase_use_fallocate
;
srv_use_posix_fallocate
=
(
ibool
)
innobase_use_fallocate
;
#endif
srv_use_atomic_writes
=
(
ibool
)
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
,
PLUGIN_VAR_NOCMDARG
|
PLUGIN_VAR_READONLY
,
"Preallocate files fast, using operating system functionality. On POSIX systems, posix_fallocate system call is used."
,
NULL
,
NULL
,
TRU
E
);
NULL
,
NULL
,
FALS
E
);
static
MYSQL_SYSVAR_ULONG
(
io_capacity
,
srv_io_capacity
,
PLUGIN_VAR_RQCMDARG
,
...
...
storage/xtradb/handler/ha_innodb.cc
View file @
6edcd45e
...
...
@@ -3082,7 +3082,7 @@ innobase_change_buffering_inited_ok:
#endif
#ifdef HAVE_POSIX_FALLOCATE
srv_use_posix_fallocate
=
0
&&
(
ibool
)
innobase_use_fallocate
;
srv_use_posix_fallocate
=
(
ibool
)
innobase_use_fallocate
;
#endif
srv_use_atomic_writes
=
(
ibool
)
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
,
PLUGIN_VAR_NOCMDARG
|
PLUGIN_VAR_READONLY
,
"Preallocate files fast, using operating system functionality. On POSIX systems, posix_fallocate system call is used."
,
NULL
,
NULL
,
TRU
E
);
NULL
,
NULL
,
FALS
E
);
static
MYSQL_SYSVAR_ULONG
(
io_capacity
,
srv_io_capacity
,
PLUGIN_VAR_RQCMDARG
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment