MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:msvensson Date:June 19 2007 7:56am
Subject:bk commit into 5.0 tree (msvensson:1.2531) BUG#28769
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-19 09:56:19+02:00, msvensson@pilot.(none) +4 -0
  Bug#28769 Test case "innodb" fails with --skip-log-bin
   - Move binlog related tests to binlog_innodb.test
   - Remove "source include/have_log_bin.inc" from innodb.test

  mysql-test/r/binlog_innodb.result@stripped, 2007-06-19 09:56:18+02:00, msvensson@pilot.(none) +23 -0
    Move binlog related tests to binlog_innodb.test

  mysql-test/r/binlog_innodb.result@stripped, 2007-06-19 09:56:18+02:00, msvensson@pilot.(none) +0 -0

  mysql-test/r/innodb.result@stripped, 2007-06-19 09:56:18+02:00, msvensson@pilot.(none) +2 -25
    Move binlog related tests to binlog_innodb.test

  mysql-test/t/binlog_innodb.test@stripped, 2007-06-19 09:56:18+02:00, msvensson@pilot.(none) +39 -0
    Move binlog related tests to binlog_innodb.test

  mysql-test/t/binlog_innodb.test@stripped, 2007-06-19 09:56:18+02:00, msvensson@pilot.(none) +0 -0

  mysql-test/t/innodb.test@stripped, 2007-06-19 09:56:18+02:00, msvensson@pilot.(none) +0 -35
    Move binlog related tests to binlog_innodb.test

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.(none)
# Root:	/data/msvensson/mysql/bug28769/my50-bug28769

--- 1.167/mysql-test/r/innodb.result	2007-04-19 03:36:16 +02:00
+++ 1.168/mysql-test/r/innodb.result	2007-06-19 09:56:18 +02:00
@@ -1640,29 +1640,6 @@ t2	CREATE TABLE `t2` (
   CONSTRAINT `t2_ibfk_2` FOREIGN KEY (`b`) REFERENCES `t1` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 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;
 ERROR 42S21: Duplicate column name 'c'
 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
 show status like "Innodb_rows_deleted";
 Variable_name	Value
-Innodb_rows_deleted	2070
+Innodb_rows_deleted	70
 show status like "Innodb_rows_inserted";
 Variable_name	Value
-Innodb_rows_inserted	31727
+Innodb_rows_inserted	29727
 show status like "Innodb_rows_updated";
 Variable_name	Value
 Innodb_rows_updated	29530

--- 1.141/mysql-test/t/innodb.test	2007-06-07 19:18:00 +02:00
+++ 1.142/mysql-test/t/innodb.test	2007-06-19 09:56:18 +02:00
@@ -12,7 +12,6 @@
 #######################################################################
 
 -- source include/have_innodb.inc
--- source include/have_log_bin.inc
 
 #
 # Small basic test with ignore
@@ -1154,40 +1153,6 @@ create table t2 (a int auto_increment pr
 show create table t2;
 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
--- New file ---
+++ mysql-test/r/binlog_innodb.result	07/06/19 09:56:18
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;

--- New file ---
+++ mysql-test/t/binlog_innodb.test	07/06/19 09:56:18
-- 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;



Thread
bk commit into 5.0 tree (msvensson:1.2531) BUG#28769msvensson19 Jun