bk commit into 5.1 tree (igor:1.2339)

[igor]

Below is the list of changes that have just been committed into a local
5.1 repository of igor. When igor 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.2339 06/04/17 16:40:16 igor@stripped +5 -0
  Merge ibabaev@stripped:/home/bk/mysql-5.1-new
  into  rurik.mysql.com:/home/igor/mysql-5.1

  sql/sql_insert.cc
    1.198 06/04/17 16:40:08 igor@stripped +0 -0
    Auto merged

  sql/item_timefunc.h
    1.68 06/04/17 16:40:08 igor@stripped +0 -0
    Auto merged

  sql/item_timefunc.cc
    1.112 06/04/17 16:40:08 igor@stripped +0 -0
    Auto merged

  mysql-test/t/innodb.test
    1.138 06/04/17 16:40:08 igor@stripped +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.171 06/04/17 16:40:08 igor@stripped +0 -0
    Auto merged

# 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:	igor
# Host:	rurik.mysql.com
# Root:	/home/igor/mysql-5.1/RESYNC

--- 1.197/sql/sql_insert.cc	2006-04-12 13:14:52 -07:00
+++ 1.198/sql/sql_insert.cc	2006-04-17 16:40:08 -07:00
@@ -1713,7 +1713,7 @@
     since it does not find one in the list.
   */
   pthread_mutex_lock(&di->mutex);
-#if !defined( __WIN__) && !defined(OS2)	/* Win32 calls this in pthread_create */
+#if !defined( __WIN__) /* Win32 calls this in pthread_create */
   if (my_thread_init())
   {
     strmov(thd->net.last_error,ER(thd->net.last_errno=ER_OUT_OF_RESOURCES));
@@ -1729,7 +1729,7 @@
     strmov(thd->net.last_error,ER(thd->net.last_errno=ER_OUT_OF_RESOURCES));
     goto err;
   }
-#if !defined(__WIN__) && !defined(OS2) && !defined(__NETWARE__)
+#if !defined(__WIN__) && !defined(__NETWARE__)
   sigset_t set;
   VOID(sigemptyset(&set));			// Get mask in use
   VOID(pthread_sigmask(SIG_UNBLOCK,&set,&thd->block_signals));

--- 1.170/mysql-test/r/innodb.result	2006-04-12 18:15:31 -07:00
+++ 1.171/mysql-test/r/innodb.result	2006-04-17 16:40:08 -07:00
@@ -1640,6 +1640,30 @@
   CONSTRAINT `t2_ibfk_2` FOREIGN KEY (`b`) REFERENCES `t1` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 drop table t2, t1;
+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
+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;
 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;
@@ -1751,6 +1775,21 @@
 count(*)
 1
 drop table t1;
+show status like "Innodb_buffer_pool_pages_total";
+Variable_name	Value
+Innodb_buffer_pool_pages_total	512
+show status like "Innodb_page_size";
+Variable_name	Value
+Innodb_page_size	16384
+show status like "Innodb_rows_deleted";
+Variable_name	Value
+Innodb_rows_deleted	2070
+show status like "Innodb_rows_inserted";
+Variable_name	Value
+Innodb_rows_inserted	31727
+show status like "Innodb_rows_updated";
+Variable_name	Value
+Innodb_rows_updated	29530
 show status like "Innodb_row_lock_waits";
 Variable_name	Value
 Innodb_row_lock_waits	0

--- 1.137/mysql-test/t/innodb.test	2006-04-12 18:15:31 -07:00
+++ 1.138/mysql-test/t/innodb.test	2006-04-17 16:40:08 -07:00
@@ -1142,6 +1142,41 @@
 
 
 #
+# 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";
+
+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
 #
 --error 1060
@@ -1254,6 +1289,15 @@
 select * from t1 where x > -16;
 select count(*) from t1 where x = 18446744073709551601;
 drop table t1;
+
+
+# Test for testable InnoDB status variables. This test
+# uses previous ones(pages_created, rows_deleted, ...).
+show status like "Innodb_buffer_pool_pages_total";
+show status like "Innodb_page_size";
+show status like "Innodb_rows_deleted";
+show status like "Innodb_rows_inserted";
+show status like "Innodb_rows_updated";
 
 # Test for row locks InnoDB status variables.
 show status like "Innodb_row_lock_waits";