Merge pilot.(none):/data/msvensson/mysql/bug28769/my50-bug28769
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
This commit is contained in:
commit
c021fc9a92
23
mysql-test/r/binlog_innodb.result
Normal file
23
mysql-test/r/binlog_innodb.result
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
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
|
||||||
|
create table t1 (a int) engine=innodb;
|
||||||
|
show status like "binlog_cache_use";
|
||||||
|
Variable_name Value
|
||||||
|
Binlog_cache_use 1
|
||||||
|
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 2
|
||||||
|
show status like "binlog_cache_disk_use";
|
||||||
|
Variable_name Value
|
||||||
|
Binlog_cache_disk_use 1
|
||||||
|
drop table t1;
|
@ -1640,29 +1640,6 @@ t2 CREATE TABLE `t2` (
|
|||||||
CONSTRAINT `t2_ibfk_2` FOREIGN KEY (`b`) REFERENCES `t1` (`id`)
|
CONSTRAINT `t2_ibfk_2` FOREIGN KEY (`b`) REFERENCES `t1` (`id`)
|
||||||
) ENGINE=InnoDB DEFAULT CHARSET=latin1
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1
|
||||||
drop table t2, t1;
|
drop table t2, t1;
|
||||||
show status like "binlog_cache_use";
|
|
||||||
Variable_name Value
|
|
||||||
Binlog_cache_use 155
|
|
||||||
show status like "binlog_cache_disk_use";
|
|
||||||
Variable_name Value
|
|
||||||
Binlog_cache_disk_use 0
|
|
||||||
create table t1 (a int) engine=innodb;
|
|
||||||
show status like "binlog_cache_use";
|
|
||||||
Variable_name Value
|
|
||||||
Binlog_cache_use 156
|
|
||||||
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 157
|
|
||||||
show status like "binlog_cache_disk_use";
|
|
||||||
Variable_name Value
|
|
||||||
Binlog_cache_disk_use 1
|
|
||||||
drop table t1;
|
|
||||||
create table t1 (c char(10), index (c,c)) engine=innodb;
|
create table t1 (c char(10), index (c,c)) engine=innodb;
|
||||||
ERROR 42S21: Duplicate column name 'c'
|
ERROR 42S21: Duplicate column name 'c'
|
||||||
create table t1 (c1 char(10), c2 char(10), index (c1,c2,c1)) engine=innodb;
|
create table t1 (c1 char(10), c2 char(10), index (c1,c2,c1)) engine=innodb;
|
||||||
@ -1782,10 +1759,10 @@ Variable_name Value
|
|||||||
Innodb_page_size 16384
|
Innodb_page_size 16384
|
||||||
show status like "Innodb_rows_deleted";
|
show status like "Innodb_rows_deleted";
|
||||||
Variable_name Value
|
Variable_name Value
|
||||||
Innodb_rows_deleted 2070
|
Innodb_rows_deleted 70
|
||||||
show status like "Innodb_rows_inserted";
|
show status like "Innodb_rows_inserted";
|
||||||
Variable_name Value
|
Variable_name Value
|
||||||
Innodb_rows_inserted 31727
|
Innodb_rows_inserted 29727
|
||||||
show status like "Innodb_rows_updated";
|
show status like "Innodb_rows_updated";
|
||||||
Variable_name Value
|
Variable_name Value
|
||||||
Innodb_rows_updated 29530
|
Innodb_rows_updated 29530
|
||||||
|
39
mysql-test/t/binlog_innodb.test
Normal file
39
mysql-test/t/binlog_innodb.test
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
-- source include/have_innodb.inc
|
||||||
|
-- source include/have_log_bin.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.
|
||||||
|
#
|
||||||
|
show status like "binlog_cache_use";
|
||||||
|
show status like "binlog_cache_disk_use";
|
||||||
|
|
||||||
|
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;
|
||||||
|
|
||||||
|
|
@ -12,7 +12,6 @@
|
|||||||
#######################################################################
|
#######################################################################
|
||||||
|
|
||||||
-- source include/have_innodb.inc
|
-- source include/have_innodb.inc
|
||||||
-- source include/have_log_bin.inc
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Small basic test with ignore
|
# Small basic test with ignore
|
||||||
@ -1155,40 +1154,6 @@ show create table t2;
|
|||||||
drop table t2, t1;
|
drop table t2, t1;
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
#
|
|
||||||
show status like "binlog_cache_use";
|
|
||||||
show status like "binlog_cache_disk_use";
|
|
||||||
|
|
||||||
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;
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Bug #6126: Duplicate columns in keys gives misleading error message
|
# Bug #6126: Duplicate columns in keys gives misleading error message
|
||||||
#
|
#
|
||||||
|
Loading…
x
Reference in New Issue
Block a user