3271 Marko Mäkelä 2010-10-21 [merge]
Merge from mysql-5.5-innodb to mysql-trunk-innodb
modified:
mysql-test/suite/sys_vars/r/all_vars.result
mysql-test/suite/sys_vars/t/all_vars.test
3270 Marko MäkelE_PAGE.
This also removes two printouts " single page 0".
modified:
storage/innobase/buf/buf0buf.c
storage/innobase/include/buf0buf.ic
storage/innobase/include/buf0types.h
3269 Marko Mäkelä 2010-10-21 [merge]
Merge from mysql-5.5-innodb to mysql-trunk-innodb
removed:
storage/innobase/handler/mysql_addons.cc
storage/innobase/include/mysql_addons.h
storage/innobase/mysql-test/
storage/innobase/mysql-test/patches/
storage/innobase/mysql-test/patches/README
storage/innobase/mysql-test/patches/index_merge_innodb-explain.diff
storage/innobase/mysql-test/patches/information_schema.diff
storage/innobase/mysql-test/patches/innodb_change_buffering_basic.diff
storage/innobase/mysql-test/patches/innodb_file_per_table.diff
storage/innobase/mysql-test/patches/innodb_lock_wait_timeout.diff
storage/innobase/mysql-test/patches/innodb_thread_concurrency_basic.diff
storage/innobase/mysql-test/patches/partition_innodb.diff
modified:
storage/innobase/CMakeLists.txt
storage/innobase/Makefile.am
storage/innobase/trx/trx0i_s.c
=== modified file 'mysql-test/suite/sys_vars/r/all_vars.result'
--- a/mysql-test/suite/sys_vars/r/all_vars.result revid:marko.makela@stripped006-elz43uh9qp015wle
+++ b/mysql-test/suite/sys_vars/r/all_vars.result revid:marko.makela@stripped3-7s368m8e6potnrzi
@@ -3,6 +3,7 @@ create table t2 (variable_name text);
load data infile "MYSQLTEST_VARDIR/tmp/sys_vars.all_vars.txt" into table t1;
insert into t2 select variable_name from information_schema.global_variables;
insert into t2 select variable_name from information_schema.session_variables;
+delete from t2 where variable_name='innodb_change_buffering_debug';
update t2 set variable_name= replace(variable_name, "PERFORMANCE_SCHEMA_", "PFS_");
select variable_name as `There should be *no* long test name listed below:` from t2
where length(variable_name) > 50;
=== modified file 'mysql-test/suite/sys_vars/t/all_vars.test'
--- a/mysql-test/suite/sys_vars/t/all_vars.test revid:marko.makela@strippedlz43uh9qp015wle
+++ b/mysql-test/suite/sys_vars/t/all_vars.test revid:marko.makela@strippedm8e6potnrzi
@@ -61,6 +61,9 @@ eval load data infile "$MYSQLTEST_VARDIR
insert into t2 select variable_name from information_schema.global_variables;
insert into t2 select variable_name from information_schema.session_variables;
+# This is only present in debug builds.
+delete from t2 where variable_name='innodb_change_buffering_debug';
+
# Performance schema variables are too long for files named
# 'mysql-test/suite/sys_vars/t/' ...
# ... 'performance_schema_events_waits_history_long_size_basic-master.opt'
=== modified file 'storage/innobase/buf/buf0buf.c'
--- a/storage/innobase/buf/buf0buf.c revid:marko.makela@oracle.com-20101021075006-elz43uh9qp015wle
+++ b/storage/innobase/buf/buf0buf.c revid:marko.makela@stripped1021083303-7s368m8e6potnrzi
@@ -4583,7 +4583,6 @@ buf_pool_validate_instance(
buf_page_t* b;
buf_chunk_t* chunk;
ulint i;
- ulint n_single_flush = 0;
ulint n_lru_flush = 0;
ulint n_list_flush = 0;
ulint n_lru = 0;
@@ -4655,9 +4654,6 @@ buf_pool_validate_instance(
case BUF_FLUSH_LIST:
n_list_flush++;
break;
- case BUF_FLUSH_SINGLE_PAGE:
- n_single_flush++;
- break;
default:
ut_error;
}
@@ -4747,9 +4743,6 @@ buf_pool_validate_instance(
case BUF_FLUSH_LIST:
n_list_flush++;
break;
- case BUF_FLUSH_SINGLE_PAGE:
- n_single_flush++;
- break;
default:
ut_error;
}
@@ -4795,7 +4788,6 @@ buf_pool_validate_instance(
ut_error;
}
- ut_a(buf_pool->n_flush[BUF_FLUSH_SINGLE_PAGE] == n_single_flush);
ut_a(buf_pool->n_flush[BUF_FLUSH_LIST] == n_list_flush);
ut_a(buf_pool->n_flush[BUF_FLUSH_LRU] == n_lru_flush);
@@ -4865,7 +4857,7 @@ buf_print_instance(
"modified database pages %lu\n"
"n pending decompressions %lu\n"
"n pending reads %lu\n"
- "n pending flush LRU %lu list %lu single page %lu\n"
+ "n pending flush LRU %lu list %lu\n"
"pages made young %lu, not young %lu\n"
"pages read %lu, created %lu, written %lu\n",
(ulong) size,
@@ -4876,7 +4868,6 @@ buf_print_instance(
(ulong) buf_pool->n_pend_reads,
(ulong) buf_pool->n_flush[BUF_FLUSH_LRU],
(ulong) buf_pool->n_flush[BUF_FLUSH_LIST],
- (ulong) buf_pool->n_flush[BUF_FLUSH_SINGLE_PAGE],
(ulong) buf_pool->stat.n_pages_made_young,
(ulong) buf_pool->stat.n_pages_not_made_young,
(ulong) buf_pool->stat.n_pages_read,
@@ -5102,8 +5093,7 @@ buf_get_n_pending_ios(void)
pend_ios +=
buf_pool->n_pend_reads
+ buf_pool->n_flush[BUF_FLUSH_LRU]
- + buf_pool->n_flush[BUF_FLUSH_LIST]
- + buf_pool->n_flush[BUF_FLUSH_SINGLE_PAGE];
+ + buf_pool->n_flush[BUF_FLUSH_LIST];
}
return(pend_ios);
@@ -5157,7 +5147,7 @@ buf_print_io_instance(
"Old database pages %lu\n"
"Modified db pages %lu\n"
"Pending reads %lu\n"
- "Pending writes: LRU %lu, flush list %lu, single page %lu\n",
+ "Pending writes: LRU %lu, flush list %lu\n",
(ulong) buf_pool->curr_size,
(ulong) UT_LIST_GET_LEN(buf_pool->free),
(ulong) UT_LIST_GET_LEN(buf_pool->LRU),
@@ -5167,8 +5157,7 @@ buf_print_io_instance(
(ulong) buf_pool->n_flush[BUF_FLUSH_LRU]
+ buf_pool->init_flush[BUF_FLUSH_LRU],
(ulong) buf_pool->n_flush[BUF_FLUSH_LIST]
- + buf_pool->init_flush[BUF_FLUSH_LIST],
- (ulong) buf_pool->n_flush[BUF_FLUSH_SINGLE_PAGE]);
+ + buf_pool->init_flush[BUF_FLUSH_LIST]);
buf_flush_list_mutex_exit(buf_pool);
@@ -5343,8 +5332,7 @@ buf_pool_check_no_pending_io(void)
pending_io += buf_pool->n_pend_reads
+ buf_pool->n_flush[BUF_FLUSH_LRU]
- + buf_pool->n_flush[BUF_FLUSH_LIST]
- + buf_pool->n_flush[BUF_FLUSH_SINGLE_PAGE];
+ + buf_pool->n_flush[BUF_FLUSH_LIST];
}
=== modified file 'storage/innobase/include/buf0buf.ic'
--- a/storage/innobase/include/buf0buf.ic revid:marko.makela@stripped075006-elz43uh9qp015wle
+++ b/storage/innobase/include/buf0buf.ic revid:marko.makela@stripped68m8e6potnrzi
@@ -301,7 +301,6 @@ buf_page_get_flush_type(
#ifdef UNIV_DEBUG
switch (flush_type) {
case BUF_FLUSH_LRU:
- case BUF_FLUSH_SINGLE_PAGE:
case BUF_FLUSH_LIST:
return(flush_type);
case BUF_FLUSH_N_TYPES:
=== modified file 'storage/innobase/include/buf0types.h'
--- a/storage/innobase/include/buf0types.h revid:marko.makela@stripped
+++ b/storage/innobase/include/buf0types.h revid:marko.makela@oracle.com-20101021083303-7s368m8e6potnrzi
@@ -45,7 +45,6 @@ typedef byte buf_frame_t;
/** Flags for flush types */
enum buf_flush {
BUF_FLUSH_LRU = 0, /*!< flush via the LRU list */
- BUF_FLUSH_SINGLE_PAGE, /*!< flush a single page */
BUF_FLUSH_LIST, /*!< flush via the flush list
of dirty blocks */
BUF_FLUSH_N_TYPES /*!< index of last element + 1 */
Attachment: [text/bzr-bundle] bzr/marko.makela@oracle.com-20101021083303-7s368m8e6potnrzi.bundle
| Thread |
|---|
| • bzr push into mysql-trunk-innodb branch (marko.makela:3269 to 3271) | marko.makela | 21 Oct |
