Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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
1.1836 05/05/09 21:06:14 tomas@stripped +4 -0
moved binloc_cache test from innodb.test to binlog.test
mysql-test/t/innodb.test
1.87 05/05/09 21:06:01 tomas@stripped +0 -34
moved binloc_cache test from innodb.test to binlog.test
mysql-test/t/binlog.test
1.8 05/05/09 21:06:01 tomas@stripped +34 -0
moved binloc_cache test from innodb.test to binlog.test
mysql-test/r/innodb.result
1.110 05/05/09 21:06:01 tomas@stripped +2 -25
moved binloc_cache test from innodb.test to binlog.test
mysql-test/r/binlog.result
1.6 05/05/09 21:06:01 tomas@stripped +23 -0
moved binloc_cache test from innodb.test to binlog.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: tomas
# Host: poseidon.ndb.mysql.com
# Root: /home/tomas/wl2325
--- 1.109/mysql-test/r/innodb.result 2005-05-02 17:06:30 +02:00
+++ 1.110/mysql-test/r/innodb.result 2005-05-09 21:06:01 +02:00
@@ -1631,29 +1631,6 @@
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 154
-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 155
-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 156
-show status like "binlog_cache_disk_use";
-Variable_name Value
-Binlog_cache_disk_use 1
-drop table t1;
create table t1 (x bigint unsigned not null primary key) engine=innodb;
insert into t1(x) values (0xfffffffffffffff0),(0xfffffffffffffff1);
select * from t1;
@@ -1714,10 +1691,10 @@
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 31709
+Innodb_rows_inserted 29709
show status like "Innodb_rows_updated";
Variable_name Value
Innodb_rows_updated 29530
--- 1.86/mysql-test/t/innodb.test 2005-04-16 17:57:14 +02:00
+++ 1.87/mysql-test/t/innodb.test 2005-05-09 21:06:01 +02:00
@@ -1143,40 +1143,6 @@
#
-# 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;
-
-#
# range optimizer problem
#
--- 1.5/mysql-test/r/binlog.result 2005-04-08 11:40:41 +02:00
+++ 1.6/mysql-test/r/binlog.result 2005-05-09 21:06:01 +02:00
@@ -133,3 +133,26 @@
show binlog events in 'master-bin.000002' from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000002 # Query 1 # use `test`; drop table t1
+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 0
+create table t1 (a int) engine=innodb;
+show status like "binlog_cache_use";
+Variable_name Value
+Binlog_cache_use 3
+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;
--- 1.7/mysql-test/t/binlog.test 2005-04-13 11:39:07 +02:00
+++ 1.8/mysql-test/t/binlog.test 2005-05-09 21:06:01 +02:00
@@ -47,3 +47,37 @@
--replace_column 2 # 5 #
show binlog events in 'master-bin.000002' from 102;
+#
+# 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.1 tree (tomas:1.1836) | tomas | 9 May |
