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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
423501aa
Commit
423501aa
authored
Nov 05, 2010
by
Alfranio Correia
Browse files
Options
Browse Files
Download
Plain Diff
merge mysql-5.5-bugteam (local) --> mysql-5.5-bugteam
parents
f0ce6787
2d84c155
Changes
14
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
530 additions
and
231 deletions
+530
-231
mysql-test/extra/binlog_tests/binlog_cache_stat.test
mysql-test/extra/binlog_tests/binlog_cache_stat.test
+195
-0
mysql-test/extra/binlog_tests/innodb_stat.test
mysql-test/extra/binlog_tests/innodb_stat.test
+0
-41
mysql-test/suite/binlog/r/binlog_innodb.result
mysql-test/suite/binlog/r/binlog_innodb.result
+2
-2
mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result
mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result
+0
-25
mysql-test/suite/binlog/r/binlog_mixed_cache_stat.result
mysql-test/suite/binlog/r/binlog_mixed_cache_stat.result
+60
-0
mysql-test/suite/binlog/r/binlog_row_cache_stat.result
mysql-test/suite/binlog/r/binlog_row_cache_stat.result
+60
-0
mysql-test/suite/binlog/r/binlog_row_innodb_stat.result
mysql-test/suite/binlog/r/binlog_row_innodb_stat.result
+0
-25
mysql-test/suite/binlog/r/binlog_stm_cache_stat.result
mysql-test/suite/binlog/r/binlog_stm_cache_stat.result
+60
-0
mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result
mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result
+0
-25
mysql-test/suite/binlog/t/binlog_mixed_cache_stat.test
mysql-test/suite/binlog/t/binlog_mixed_cache_stat.test
+1
-1
mysql-test/suite/binlog/t/binlog_row_cache_stat.test
mysql-test/suite/binlog/t/binlog_row_cache_stat.test
+1
-1
mysql-test/suite/binlog/t/binlog_stm_cache_stat.test
mysql-test/suite/binlog/t/binlog_stm_cache_stat.test
+1
-1
sql/log.cc
sql/log.cc
+149
-109
sql/log_event.h
sql/log_event.h
+1
-1
No files found.
mysql-test/extra/binlog_tests/binlog_cache_stat.test
0 → 100644
View file @
423501aa
# Embedded server doesn't support binlog
--
source
include
/
not_embedded
.
inc
--
source
include
/
have_innodb
.
inc
# Creating tables
--
disable_warnings
drop
table
if
exists
t1
,
t2
;
--
enable_warnings
create
table
t1
(
a
int
)
engine
=
innodb
;
create
table
t2
(
a
int
)
engine
=
myisam
;
#
# This test checks binlog_cache_use and binlog_cache_disk_use when
# transactions are committed and after when they are aborted.
#
#
# Checking commit.
#
--
echo
****
Preparing
the
enviroment
to
check
commit
and
its
effect
on
--
echo
****
the
binlog_cache_use
and
binlog_cache_disk_use
.
--
echo
****
Expected
:
binlog_cache_use
=
0
,
binlog_cache_disk_use
=
0.
flush
status
;
let
$exp_cache
=
0
;
let
$got_cache
=
query_get_value
(
show
status
like
"binlog_cache_use"
,
Value
,
1
);
let
$exp_disk
=
0
;
let
$got_disk
=
query_get_value
(
show
status
like
"binlog_cache_disk_use"
,
Value
,
1
);
if
(
`SELECT $got_cache <> $exp_cache || $got_disk <> $exp_disk`
)
{
--
echo
"Expected: binlog_cache_use =
$exp_cache
, binlog_cache_disk_use =
$exp_disk
but got binlog_cache_use =
$got_cache
, binlog_cache_disk_use =
$got_disk
but"
--
die
}
--
echo
****
Now
we
are
going
to
create
transactional
changes
which
are
long
enough
so
--
echo
****
they
will
be
flushed
to
disk
...
--
echo
****
Expected
:
binlog_cache_use
=
1
,
binlog_cache_disk_use
=
1.
let
$
1
=
2000
;
disable_query_log
;
begin
;
while
(
$
1
)
{
eval
insert
into
t1
values
(
$
1
);
dec
$
1
;
}
commit
;
enable_query_log
;
let
$exp_cache
=
1
;
let
$got_cache
=
query_get_value
(
show
status
like
"binlog_cache_use"
,
Value
,
1
);
let
$exp_disk
=
1
;
let
$got_disk
=
query_get_value
(
show
status
like
"binlog_cache_disk_use"
,
Value
,
1
);
if
(
`SELECT $got_cache <> $exp_cache || $got_disk <> $exp_disk`
)
{
--
echo
"Expected: binlog_cache_use =
$exp_cache
, binlog_cache_disk_use =
$exp_disk
but got binlog_cache_use =
$got_cache
, binlog_cache_disk_use =
$got_disk
but"
--
die
}
--
echo
****
Transactional
changes
which
should
not
be
flushed
to
disk
and
so
should
not
--
echo
****
increase
binlog_cache_disk_use
.
--
echo
****
Expected
:
binlog_cache_use
=
2
,
binlog_cache_disk_use
=
1.
begin
;
insert
into
t1
values
(
1
);
commit
;
let
$exp_cache
=
2
;
let
$got_cache
=
query_get_value
(
show
status
like
"binlog_cache_use"
,
Value
,
1
);
let
$exp_disk
=
1
;
let
$got_disk
=
query_get_value
(
show
status
like
"binlog_cache_disk_use"
,
Value
,
1
);
if
(
`SELECT $got_cache <> $exp_cache || $got_disk <> $exp_disk`
)
{
--
echo
"Expected: binlog_cache_use =
$exp_cache
, binlog_cache_disk_use =
$exp_disk
but got binlog_cache_use =
$got_cache
, binlog_cache_disk_use =
$got_disk
but"
--
die
}
--
echo
****
Non
-
Transactional
changes
which
should
not
be
flushed
to
disk
and
so
should
not
--
echo
****
increase
binlog_cache_disk_use
.
--
echo
****
Expected
:
binlog_cache_use
=
3
,
binlog_cache_disk_use
=
1.
begin
;
insert
into
t2
values
(
1
);
commit
;
let
$exp_cache
=
3
;
let
$got_cache
=
query_get_value
(
show
status
like
"binlog_cache_use"
,
Value
,
1
);
let
$exp_disk
=
1
;
let
$got_disk
=
query_get_value
(
show
status
like
"binlog_cache_disk_use"
,
Value
,
1
);
if
(
`SELECT $got_cache <> $exp_cache || $got_disk <> $exp_disk`
)
{
--
echo
"Expected: binlog_cache_use =
$exp_cache
, binlog_cache_disk_use =
$exp_disk
but got binlog_cache_use =
$got_cache
, binlog_cache_disk_use =
$got_disk
but"
--
die
}
--
echo
****
Mixed
changes
which
should
not
be
flushed
to
disk
and
so
should
not
--
echo
****
increase
binlog_cache_disk_use
.
--
echo
****
Expected
:
binlog_cache_use
=
5
,
binlog_cache_disk_use
=
1.
begin
;
insert
into
t1
values
(
1
);
insert
into
t2
values
(
1
);
commit
;
let
$exp_cache
=
5
;
let
$got_cache
=
query_get_value
(
show
status
like
"binlog_cache_use"
,
Value
,
1
);
let
$exp_disk
=
1
;
let
$got_disk
=
query_get_value
(
show
status
like
"binlog_cache_disk_use"
,
Value
,
1
);
if
(
`SELECT $got_cache <> $exp_cache || $got_disk <> $exp_disk`
)
{
--
echo
"Expected: binlog_cache_use =
$exp_cache
, binlog_cache_disk_use =
$exp_disk
but got binlog_cache_use =
$got_cache
, binlog_cache_disk_use =
$got_disk
but"
--
die
}
#
# Checking abort.
#
--
echo
****
Preparing
the
enviroment
to
check
abort
and
its
effect
on
--
echo
****
the
binlog_cache_use
and
binlog_cache_disk_use
--
echo
****
Expected
:
binlog_cache_use
=
0
,
binlog_cache_disk_use
=
0.
flush
status
;
let
$exp_cache
=
0
;
let
$got_cache
=
query_get_value
(
show
status
like
"binlog_cache_use"
,
Value
,
1
);
let
$exp_disk
=
0
;
let
$got_disk
=
query_get_value
(
show
status
like
"binlog_cache_disk_use"
,
Value
,
1
);
if
(
`SELECT $got_cache <> $exp_cache || $got_disk <> $exp_disk`
)
{
--
echo
"Expected: binlog_cache_use =
$exp_cache
, binlog_cache_disk_use =
$exp_disk
but got binlog_cache_use =
$got_cache
, binlog_cache_disk_use =
$got_disk
but"
--
die
}
--
echo
****
Now
we
are
going
to
create
transactional
changes
which
are
long
enough
so
--
echo
****
they
will
be
flushed
to
disk
...
--
echo
****
Expected
:
binlog_cache_use
=
1
,
binlog_cache_disk_use
=
1.
let
$
1
=
2000
;
disable_query_log
;
begin
;
while
(
$
1
)
{
eval
insert
into
t1
values
(
$
1
);
dec
$
1
;
}
rollback
;
enable_query_log
;
let
$exp_cache
=
1
;
let
$got_cache
=
query_get_value
(
show
status
like
"binlog_cache_use"
,
Value
,
1
);
let
$exp_disk
=
1
;
let
$got_disk
=
query_get_value
(
show
status
like
"binlog_cache_disk_use"
,
Value
,
1
);
if
(
`SELECT $got_cache <> $exp_cache || $got_disk <> $exp_disk`
)
{
--
echo
"Expected: binlog_cache_use =
$exp_cache
, binlog_cache_disk_use =
$exp_disk
but got binlog_cache_use =
$got_cache
, binlog_cache_disk_use =
$got_disk
but"
--
die
}
--
echo
****
Transactional
changes
which
should
not
be
flushed
to
disk
and
so
should
not
--
echo
****
increase
binlog_cache_disk_use
.
--
echo
****
Expected
:
binlog_cache_use
=
2
,
binlog_cache_disk_use
=
1.
begin
;
insert
into
t1
values
(
1
);
rollback
;
let
$exp_cache
=
2
;
let
$got_cache
=
query_get_value
(
show
status
like
"binlog_cache_use"
,
Value
,
1
);
let
$exp_disk
=
1
;
let
$got_disk
=
query_get_value
(
show
status
like
"binlog_cache_disk_use"
,
Value
,
1
);
if
(
`SELECT $got_cache <> $exp_cache || $got_disk <> $exp_disk`
)
{
--
echo
"Expected: binlog_cache_use =
$exp_cache
, binlog_cache_disk_use =
$exp_disk
but got binlog_cache_use =
$got_cache
, binlog_cache_disk_use =
$got_disk
but"
--
die
}
--
echo
****
Non
-
Transactional
changes
which
should
not
be
flushed
to
disk
and
so
should
not
--
echo
****
increase
binlog_cache_disk_use
.
--
echo
****
Expected
:
binlog_cache_use
=
3
,
binlog_cache_disk_use
=
1.
begin
;
insert
into
t2
values
(
1
);
rollback
;
let
$exp_cache
=
3
;
let
$got_cache
=
query_get_value
(
show
status
like
"binlog_cache_use"
,
Value
,
1
);
let
$exp_disk
=
1
;
let
$got_disk
=
query_get_value
(
show
status
like
"binlog_cache_disk_use"
,
Value
,
1
);
if
(
`SELECT $got_cache <> $exp_cache || $got_disk <> $exp_disk`
)
{
--
echo
"Expected: binlog_cache_use =
$exp_cache
, binlog_cache_disk_use =
$exp_disk
but got binlog_cache_use =
$got_cache
, binlog_cache_disk_use =
$got_disk
but"
--
die
}
--
echo
****
Mixed
changes
which
should
not
be
flushed
to
disk
and
so
should
not
--
echo
****
increase
binlog_cache_disk_use
.
--
echo
****
Expected
:
binlog_cache_use
=
5
,
binlog_cache_disk_use
=
1.
begin
;
insert
into
t1
values
(
1
);
insert
into
t2
values
(
1
);
rollback
;
let
$exp_cache
=
5
;
let
$got_cache
=
query_get_value
(
show
status
like
"binlog_cache_use"
,
Value
,
1
);
let
$exp_disk
=
1
;
let
$got_disk
=
query_get_value
(
show
status
like
"binlog_cache_disk_use"
,
Value
,
1
);
if
(
`SELECT $got_cache <> $exp_cache || $got_disk <> $exp_disk`
)
{
--
echo
"Expected: binlog_cache_use =
$exp_cache
, binlog_cache_disk_use =
$exp_disk
but got binlog_cache_use =
$got_cache
, binlog_cache_disk_use =
$got_disk
but"
--
die
}
drop
table
t1
,
t2
;
mysql-test/extra/binlog_tests/innodb_stat.test
deleted
100644 → 0
View file @
f0ce6787
# Embedded server doesn't support binlog
--
source
include
/
not_embedded
.
inc
--
source
include
/
have_innodb
.
inc
#
# Let us test binlog_cache_use and binlog_cache_disk_use status vars.
# Actually this test has nothing to do with innodb per se, it just requires
# transactional table.
#
flush
status
;
show
status
like
"binlog_cache_use"
;
show
status
like
"binlog_cache_disk_use"
;
--
disable_warnings
drop
table
if
exists
t1
;
--
enable_warnings
create
table
t1
(
a
int
)
engine
=
innodb
;
# Now we are going to create transaction which is long enough so its
# transaction binlog will be flushed to disk...
let
$
1
=
2000
;
disable_query_log
;
begin
;
while
(
$
1
)
{
eval
insert
into
t1
values
(
$
1
);
dec
$
1
;
}
commit
;
enable_query_log
;
show
status
like
"binlog_cache_use"
;
show
status
like
"binlog_cache_disk_use"
;
# Transaction which should not be flushed to disk and so should not
# increase binlog_cache_disk_use.
begin
;
delete
from
t1
;
commit
;
show
status
like
"binlog_cache_use"
;
show
status
like
"binlog_cache_disk_use"
;
drop
table
t1
;
mysql-test/suite/binlog/r/binlog_innodb.result
View file @
423501aa
...
@@ -123,7 +123,7 @@ Binlog_cache_disk_use 0
...
@@ -123,7 +123,7 @@ Binlog_cache_disk_use 0
create table t1 (a int) engine=innodb;
create table t1 (a int) engine=innodb;
show status like "binlog_cache_use";
show status like "binlog_cache_use";
Variable_name Value
Variable_name Value
Binlog_cache_use
2
Binlog_cache_use
1
show status like "binlog_cache_disk_use";
show status like "binlog_cache_disk_use";
Variable_name Value
Variable_name Value
Binlog_cache_disk_use 1
Binlog_cache_disk_use 1
...
@@ -132,7 +132,7 @@ delete from t1;
...
@@ -132,7 +132,7 @@ delete from t1;
commit;
commit;
show status like "binlog_cache_use";
show status like "binlog_cache_use";
Variable_name Value
Variable_name Value
Binlog_cache_use
4
Binlog_cache_use
2
show status like "binlog_cache_disk_use";
show status like "binlog_cache_disk_use";
Variable_name Value
Variable_name Value
Binlog_cache_disk_use 1
Binlog_cache_disk_use 1
...
...
mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result
deleted
100644 → 0
View file @
f0ce6787
flush status;
show status like "binlog_cache_use";
Variable_name Value
Binlog_cache_use 0
show status like "binlog_cache_disk_use";
Variable_name Value
Binlog_cache_disk_use 0
drop table if exists t1;
create table t1 (a int) engine=innodb;
show status like "binlog_cache_use";
Variable_name Value
Binlog_cache_use 2
show status like "binlog_cache_disk_use";
Variable_name Value
Binlog_cache_disk_use 1
begin;
delete from t1;
commit;
show status like "binlog_cache_use";
Variable_name Value
Binlog_cache_use 4
show status like "binlog_cache_disk_use";
Variable_name Value
Binlog_cache_disk_use 1
drop table t1;
mysql-test/suite/binlog/r/binlog_mixed_cache_stat.result
0 → 100644
View file @
423501aa
drop table if exists t1, t2;
create table t1 (a int) engine=innodb;
create table t2 (a int) engine=myisam;
**** Preparing the enviroment to check commit and its effect on
**** the binlog_cache_use and binlog_cache_disk_use.
**** Expected: binlog_cache_use = 0, binlog_cache_disk_use = 0.
flush status;
**** Now we are going to create transactional changes which are long enough so
**** they will be flushed to disk...
**** Expected: binlog_cache_use = 1, binlog_cache_disk_use = 1.
**** Transactional changes which should not be flushed to disk and so should not
**** increase binlog_cache_disk_use.
**** Expected: binlog_cache_use = 2, binlog_cache_disk_use = 1.
begin;
insert into t1 values( 1 );
commit;
**** Non-Transactional changes which should not be flushed to disk and so should not
**** increase binlog_cache_disk_use.
**** Expected: binlog_cache_use = 3, binlog_cache_disk_use = 1.
begin;
insert into t2 values( 1 );
commit;
**** Mixed changes which should not be flushed to disk and so should not
**** increase binlog_cache_disk_use.
**** Expected: binlog_cache_use = 5, binlog_cache_disk_use = 1.
begin;
insert into t1 values( 1 );
insert into t2 values( 1 );
commit;
**** Preparing the enviroment to check abort and its effect on
**** the binlog_cache_use and binlog_cache_disk_use
**** Expected: binlog_cache_use = 0, binlog_cache_disk_use = 0.
flush status;
**** Now we are going to create transactional changes which are long enough so
**** they will be flushed to disk...
**** Expected: binlog_cache_use = 1, binlog_cache_disk_use = 1.
**** Transactional changes which should not be flushed to disk and so should not
**** increase binlog_cache_disk_use.
**** Expected: binlog_cache_use = 2, binlog_cache_disk_use = 1.
begin;
insert into t1 values( 1 );
rollback;
**** Non-Transactional changes which should not be flushed to disk and so should not
**** increase binlog_cache_disk_use.
**** Expected: binlog_cache_use = 3, binlog_cache_disk_use = 1.
begin;
insert into t2 values( 1 );
rollback;
Warnings:
Warning 1196 Some non-transactional changed tables couldn't be rolled back
**** Mixed changes which should not be flushed to disk and so should not
**** increase binlog_cache_disk_use.
**** Expected: binlog_cache_use = 5, binlog_cache_disk_use = 1.
begin;
insert into t1 values( 1 );
insert into t2 values( 1 );
rollback;
Warnings:
Warning 1196 Some non-transactional changed tables couldn't be rolled back
drop table t1, t2;
mysql-test/suite/binlog/r/binlog_row_cache_stat.result
0 → 100644
View file @
423501aa
drop table if exists t1, t2;
create table t1 (a int) engine=innodb;
create table t2 (a int) engine=myisam;
**** Preparing the enviroment to check commit and its effect on
**** the binlog_cache_use and binlog_cache_disk_use.
**** Expected: binlog_cache_use = 0, binlog_cache_disk_use = 0.
flush status;
**** Now we are going to create transactional changes which are long enough so
**** they will be flushed to disk...
**** Expected: binlog_cache_use = 1, binlog_cache_disk_use = 1.
**** Transactional changes which should not be flushed to disk and so should not
**** increase binlog_cache_disk_use.
**** Expected: binlog_cache_use = 2, binlog_cache_disk_use = 1.
begin;
insert into t1 values( 1 );
commit;
**** Non-Transactional changes which should not be flushed to disk and so should not
**** increase binlog_cache_disk_use.
**** Expected: binlog_cache_use = 3, binlog_cache_disk_use = 1.
begin;
insert into t2 values( 1 );
commit;
**** Mixed changes which should not be flushed to disk and so should not
**** increase binlog_cache_disk_use.
**** Expected: binlog_cache_use = 5, binlog_cache_disk_use = 1.
begin;
insert into t1 values( 1 );
insert into t2 values( 1 );
commit;
**** Preparing the enviroment to check abort and its effect on
**** the binlog_cache_use and binlog_cache_disk_use
**** Expected: binlog_cache_use = 0, binlog_cache_disk_use = 0.
flush status;
**** Now we are going to create transactional changes which are long enough so
**** they will be flushed to disk...
**** Expected: binlog_cache_use = 1, binlog_cache_disk_use = 1.
**** Transactional changes which should not be flushed to disk and so should not
**** increase binlog_cache_disk_use.
**** Expected: binlog_cache_use = 2, binlog_cache_disk_use = 1.
begin;
insert into t1 values( 1 );
rollback;
**** Non-Transactional changes which should not be flushed to disk and so should not
**** increase binlog_cache_disk_use.
**** Expected: binlog_cache_use = 3, binlog_cache_disk_use = 1.
begin;
insert into t2 values( 1 );
rollback;
Warnings:
Warning 1196 Some non-transactional changed tables couldn't be rolled back
**** Mixed changes which should not be flushed to disk and so should not
**** increase binlog_cache_disk_use.
**** Expected: binlog_cache_use = 5, binlog_cache_disk_use = 1.
begin;
insert into t1 values( 1 );
insert into t2 values( 1 );
rollback;
Warnings:
Warning 1196 Some non-transactional changed tables couldn't be rolled back
drop table t1, t2;
mysql-test/suite/binlog/r/binlog_row_innodb_stat.result
deleted
100644 → 0
View file @
f0ce6787
flush status;
show status like "binlog_cache_use";
Variable_name Value
Binlog_cache_use 0
show status like "binlog_cache_disk_use";
Variable_name Value
Binlog_cache_disk_use 0
drop table if exists t1;
create table t1 (a int) engine=innodb;
show status like "binlog_cache_use";
Variable_name Value
Binlog_cache_use 2
show status like "binlog_cache_disk_use";
Variable_name Value
Binlog_cache_disk_use 1
begin;
delete from t1;
commit;
show status like "binlog_cache_use";
Variable_name Value
Binlog_cache_use 4
show status like "binlog_cache_disk_use";
Variable_name Value
Binlog_cache_disk_use 1
drop table t1;
mysql-test/suite/binlog/r/binlog_stm_cache_stat.result
0 → 100644
View file @
423501aa
drop table if exists t1, t2;
create table t1 (a int) engine=innodb;
create table t2 (a int) engine=myisam;
**** Preparing the enviroment to check commit and its effect on
**** the binlog_cache_use and binlog_cache_disk_use.
**** Expected: binlog_cache_use = 0, binlog_cache_disk_use = 0.
flush status;
**** Now we are going to create transactional changes which are long enough so
**** they will be flushed to disk...
**** Expected: binlog_cache_use = 1, binlog_cache_disk_use = 1.
**** Transactional changes which should not be flushed to disk and so should not
**** increase binlog_cache_disk_use.
**** Expected: binlog_cache_use = 2, binlog_cache_disk_use = 1.
begin;
insert into t1 values( 1 );
commit;
**** Non-Transactional changes which should not be flushed to disk and so should not
**** increase binlog_cache_disk_use.
**** Expected: binlog_cache_use = 3, binlog_cache_disk_use = 1.
begin;
insert into t2 values( 1 );
commit;
**** Mixed changes which should not be flushed to disk and so should not
**** increase binlog_cache_disk_use.
**** Expected: binlog_cache_use = 5, binlog_cache_disk_use = 1.
begin;
insert into t1 values( 1 );
insert into t2 values( 1 );
commit;
**** Preparing the enviroment to check abort and its effect on
**** the binlog_cache_use and binlog_cache_disk_use
**** Expected: binlog_cache_use = 0, binlog_cache_disk_use = 0.
flush status;
**** Now we are going to create transactional changes which are long enough so
**** they will be flushed to disk...
**** Expected: binlog_cache_use = 1, binlog_cache_disk_use = 1.
**** Transactional changes which should not be flushed to disk and so should not
**** increase binlog_cache_disk_use.
**** Expected: binlog_cache_use = 2, binlog_cache_disk_use = 1.
begin;
insert into t1 values( 1 );
rollback;
**** Non-Transactional changes which should not be flushed to disk and so should not
**** increase binlog_cache_disk_use.
**** Expected: binlog_cache_use = 3, binlog_cache_disk_use = 1.
begin;
insert into t2 values( 1 );
rollback;
Warnings:
Warning 1196 Some non-transactional changed tables couldn't be rolled back
**** Mixed changes which should not be flushed to disk and so should not
**** increase binlog_cache_disk_use.
**** Expected: binlog_cache_use = 5, binlog_cache_disk_use = 1.
begin;
insert into t1 values( 1 );
insert into t2 values( 1 );
rollback;
Warnings:
Warning 1196 Some non-transactional changed tables couldn't be rolled back
drop table t1, t2;
mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result
deleted
100644 → 0
View file @
f0ce6787
flush status;
show status like "binlog_cache_use";
Variable_name Value
Binlog_cache_use 0
show status like "binlog_cache_disk_use";
Variable_name Value
Binlog_cache_disk_use 0
drop table if exists t1;
create table t1 (a int) engine=innodb;
show status like "binlog_cache_use";
Variable_name Value
Binlog_cache_use 2
show status like "binlog_cache_disk_use";
Variable_name Value
Binlog_cache_disk_use 1
begin;
delete from t1;
commit;
show status like "binlog_cache_use";
Variable_name Value
Binlog_cache_use 4
show status like "binlog_cache_disk_use";
Variable_name Value
Binlog_cache_disk_use 1
drop table t1;
mysql-test/suite/binlog/t/binlog_mix
_innodb
_stat.test
→
mysql-test/suite/binlog/t/binlog_mix
ed_cache
_stat.test
View file @
423501aa
...
@@ -2,4 +2,4 @@
...
@@ -2,4 +2,4 @@
# For both statement and row based bin logs 9/19/2005 [jbm]
# For both statement and row based bin logs 9/19/2005 [jbm]
--
source
include
/
have_binlog_format_mixed
.
inc
--
source
include
/
have_binlog_format_mixed
.
inc
--
source
extra
/
binlog_tests
/
innodb
_stat
.
test
--
source
extra
/
binlog_tests
/
binlog_cache
_stat
.
test
mysql-test/suite/binlog/t/binlog_row_
innodb
_stat.test
→
mysql-test/suite/binlog/t/binlog_row_
cache
_stat.test
View file @
423501aa
...
@@ -2,4 +2,4 @@
...
@@ -2,4 +2,4 @@
# For both statement and row based bin logs 9/19/2005 [jbm]
# For both statement and row based bin logs 9/19/2005 [jbm]
--
source
include
/
have_binlog_format_row
.
inc
--
source
include
/
have_binlog_format_row
.
inc
--
source
extra
/
binlog_tests
/
innodb
_stat
.
test
--
source
extra
/
binlog_tests
/
binlog_cache
_stat
.
test
mysql-test/suite/binlog/t/binlog_stm_
innodb
_stat.test
→
mysql-test/suite/binlog/t/binlog_stm_
cache
_stat.test
View file @
423501aa
...
@@ -2,4 +2,4 @@
...
@@ -2,4 +2,4 @@
# For both statement and row based bin logs 9/19/2005 [jbm]
# For both statement and row based bin logs 9/19/2005 [jbm]
--
source
include
/
have_binlog_format_statement
.
inc
--
source
include
/
have_binlog_format_statement
.
inc
--
source
extra
/
binlog_tests
/
innodb
_stat
.
test
--
source
extra
/
binlog_tests
/
binlog_cache
_stat
.
test
sql/log.cc
View file @
423501aa
This diff is collapsed.
Click to expand it.
sql/log_event.h
View file @
423501aa
...
@@ -2506,7 +2506,7 @@ class Xid_log_event: public Log_event
...
@@ -2506,7 +2506,7 @@ class Xid_log_event: public Log_event
my_xid
xid
;
my_xid
xid
;
#ifdef MYSQL_SERVER
#ifdef MYSQL_SERVER
Xid_log_event
(
THD
*
thd_arg
,
my_xid
x
)
:
Log_event
(
thd_arg
,
0
,
0
),
xid
(
x
)
{}
Xid_log_event
(
THD
*
thd_arg
,
my_xid
x
)
:
Log_event
(
thd_arg
,
0
,
TRUE
),
xid
(
x
)
{}
#ifdef HAVE_REPLICATION
#ifdef HAVE_REPLICATION
void
pack_info
(
Protocol
*
protocol
);
void
pack_info
(
Protocol
*
protocol
);
#endif
/* HAVE_REPLICATION */
#endif
/* HAVE_REPLICATION */
...
...
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