List:Commits« Previous MessageNext Message »
From:magnus.blaudd Date:November 18 2011 3:27pm
Subject:bzr push into mysql-trunk branch (magnus.blaudd:3437 to 3439)
View as plain text  
 3439 magnus.blaudd@stripped	2011-11-18
      cherrypick fix for bug 12320827 into trunk-cluster-base

    modified:
      mysql-test/suite/innodb/r/innodb_monitor.result
      mysql-test/suite/innodb/t/innodb_monitor.test
 3438 magnus.blaudd@stripped	2011-11-18
      Cherry pick fix for bug#12585902

    modified:
      mysql-test/t/disabled.def
 3437 magnus.blaudd@stripped	2011-11-18
      ndb
       - update trunck-cluster-base with latest compile-cluster script

    modified:
      storage/ndb/compile-cluster
=== modified file 'mysql-test/suite/innodb/r/innodb_monitor.result'
--- a/mysql-test/suite/innodb/r/innodb_monitor.result	2011-08-10 06:26:39 +0000
+++ b/mysql-test/suite/innodb/r/innodb_monitor.result	2011-11-18 15:19:17 +0000
@@ -1,11 +1,12 @@
+set global innodb_monitor_disable = All;
 select name, status from information_schema.innodb_metrics;
 name	status
 metadata_table_handles_opened	disabled
 metadata_table_handles_closed	disabled
 metadata_table_reference_count	disabled
-metadata_mem_pool_size	enabled
-lock_deadlocks	enabled
-lock_timeouts	enabled
+metadata_mem_pool_size	disabled
+lock_deadlocks	disabled
+lock_timeouts	disabled
 lock_rec_lock_waits	disabled
 lock_table_lock_waits	disabled
 lock_rec_lock_requests	disabled
@@ -15,29 +16,29 @@ lock_rec_locks	disabled
 lock_table_lock_created	disabled
 lock_table_lock_removed	disabled
 lock_table_locks	disabled
-lock_row_lock_current_waits	enabled
-lock_row_lock_time	enabled
-lock_row_lock_time_max	enabled
-lock_row_lock_waits	enabled
-lock_row_lock_time_avg	enabled
-buffer_pool_size	enabled
-buffer_pool_reads	enabled
-buffer_pool_read_requests	enabled
-buffer_pool_write_requests	enabled
+lock_row_lock_current_waits	disabled
+lock_row_lock_time	disabled
+lock_row_lock_time_max	disabled
+lock_row_lock_waits	disabled
+lock_row_lock_time_avg	disabled
+buffer_pool_size	disabled
+buffer_pool_reads	disabled
+buffer_pool_read_requests	disabled
+buffer_pool_write_requests	disabled
 buffer_pool_pages_in_flush	disabled
-buffer_pool_wait_free	enabled
-buffer_pool_read_ahead	enabled
-buffer_pool_read_ahead_evicted	enabled
-buffer_pool_pages_total	enabled
-buffer_pool_pages_misc	enabled
-buffer_pool_pages_data	enabled
-buffer_pool_pages_dirty	enabled
-buffer_pool_pages_free	enabled
-buffer_pages_created	enabled
-buffer_pages_written	enabled
-buffer_pages_read	enabled
-buffer_data_reads	enabled
-buffer_data_written	enabled
+buffer_pool_wait_free	disabled
+buffer_pool_read_ahead	disabled
+buffer_pool_read_ahead_evicted	disabled
+buffer_pool_pages_total	disabled
+buffer_pool_pages_misc	disabled
+buffer_pool_pages_data	disabled
+buffer_pool_pages_dirty	disabled
+buffer_pool_pages_free	disabled
+buffer_pages_created	disabled
+buffer_pages_written	disabled
+buffer_pages_read	disabled
+buffer_data_reads	disabled
+buffer_data_written	disabled
 buffer_flush_batch_scanned	disabled
 buffer_flush_batch_num_scan	disabled
 buffer_flush_batch_scanned_per_call	disabled
@@ -111,22 +112,22 @@ buffer_page_written_blob	disabled
 buffer_page_written_zblob	disabled
 buffer_page_written_zblob2	disabled
 buffer_page_written_other	disabled
-os_data_reads	enabled
-os_data_writes	enabled
-os_data_fsyncs	enabled
+os_data_reads	disabled
+os_data_writes	disabled
+os_data_fsyncs	disabled
 os_pending_reads	disabled
 os_pending_writes	disabled
-os_log_bytes_written	enabled
-os_log_fsyncs	enabled
-os_log_pending_fsyncs	enabled
-os_log_pending_writes	enabled
+os_log_bytes_written	disabled
+os_log_fsyncs	disabled
+os_log_pending_fsyncs	disabled
+os_log_pending_writes	disabled
 trx_commits	disabled
 trx_commits_insert_update	disabled
 trx_rollbacks	disabled
 trx_rollbacks_savepoint	disabled
 trx_rollback_active	disabled
 trx_active_transactions	disabled
-trx_rseg_history_len	enabled
+trx_rseg_history_len	disabled
 trx_undo_slots_used	disabled
 trx_undo_slots_cached	disabled
 trx_rseg_curent_size	disabled
@@ -146,14 +147,14 @@ log_max_modified_age_sync	disabled
 log_pending_log_writes	disabled
 log_pending_checkpoint_writes	disabled
 log_num_log_io	disabled
-log_waits	enabled
-log_write_requests	enabled
-log_writes	enabled
+log_waits	disabled
+log_write_requests	disabled
+log_writes	disabled
 compress_pages_compressed	disabled
 compress_pages_decompressed	disabled
 index_splits	disabled
 index_merges	disabled
-adaptive_hash_searches	enabled
+adaptive_hash_searches	disabled
 adaptive_hash_searches_btree	disabled
 adaptive_hash_pages_added	disabled
 adaptive_hash_pages_removed	disabled
@@ -161,17 +162,17 @@ adaptive_hash_rows_added	disabled
 adaptive_hash_rows_removed	disabled
 adaptive_hash_rows_deleted_no_hash_entry	disabled
 adaptive_hash_rows_updated	disabled
-file_num_open_files	enabled
-ibuf_merges_insert	enabled
-ibuf_merges_delete_mark	enabled
-ibuf_merges_delete	enabled
-ibuf_merges_discard_insert	enabled
-ibuf_merges_discard_delete_mark	enabled
-ibuf_merges_discard_delete	enabled
-ibuf_merges	enabled
-ibuf_size	enabled
+file_num_open_files	disabled
+ibuf_merges_insert	disabled
+ibuf_merges_delete_mark	disabled
+ibuf_merges_delete	disabled
+ibuf_merges_discard_insert	disabled
+ibuf_merges_discard_delete_mark	disabled
+ibuf_merges_discard_delete	disabled
+ibuf_merges	disabled
+ibuf_size	disabled
 innodb_master_thread_sleeps	disabled
-innodb_activity_count	enabled
+innodb_activity_count	disabled
 innodb_master_active_loops	disabled
 innodb_master_idle_loops	disabled
 innodb_background_drop_table_usec	disabled
@@ -181,19 +182,19 @@ innodb_mem_validate_usec	disabled
 innodb_master_purge_usec	disabled
 innodb_dict_lru_usec	disabled
 innodb_checkpoint_usec	disabled
-innodb_dblwr_writes	enabled
-innodb_dblwr_pages_written	enabled
-innodb_page_size	enabled
-innodb_rwlock_s_spin_waits	enabled
-innodb_rwlock_x_spin_waits	enabled
-innodb_rwlock_s_spin_rounds	enabled
-innodb_rwlock_x_spin_rounds	enabled
-innodb_rwlock_s_os_waits	enabled
-innodb_rwlock_x_os_waits	enabled
-dml_reads	enabled
-dml_inserts	enabled
-dml_deletes	enabled
-dml_updates	enabled
+innodb_dblwr_writes	disabled
+innodb_dblwr_pages_written	disabled
+innodb_page_size	disabled
+innodb_rwlock_s_spin_waits	disabled
+innodb_rwlock_x_spin_waits	disabled
+innodb_rwlock_s_spin_rounds	disabled
+innodb_rwlock_x_spin_rounds	disabled
+innodb_rwlock_s_os_waits	disabled
+innodb_rwlock_x_os_waits	disabled
+dml_reads	disabled
+dml_inserts	disabled
+dml_deletes	disabled
+dml_updates	disabled
 ddl_background_drop_tables	disabled
 icp_attempts	disabled
 icp_no_match	disabled
@@ -1889,6 +1890,8 @@ set global innodb_monitor_enable="";
 ERROR 42000: Variable 'innodb_monitor_enable' can't be set to the value of ''
 set global innodb_monitor_enable="_";
 ERROR 42000: Variable 'innodb_monitor_enable' can't be set to the value of '_'
+set global innodb_monitor_disable = module_metadata;
+set global innodb_monitor_reset_all = module_metadata;
 set global innodb_monitor_enable = metadata_table_handles_opened;
 create table monitor_test(col int) engine = innodb;
 select * from monitor_test;
@@ -1975,7 +1978,7 @@ name	max_count	min_count	count	max_count
 metadata_table_handles_opened	2	NULL	2	2	NULL	2	enabled
 metadata_table_handles_closed	1	NULL	1	1	NULL	1	enabled
 metadata_table_reference_count	NULL	NULL	0	NULL	NULL	0	disabled
-metadata_mem_pool_size	1048576	1048576	1048576	1048576	1048576	1048576	disabled
+metadata_mem_pool_size	NULL	NULL	0	NULL	NULL	0	disabled
 set global innodb_monitor_disable = module_metadata;
 set global innodb_monitor_reset = module_metadata;
 select name, max_count, min_count, count,
@@ -1986,7 +1989,7 @@ name	max_count	min_count	count	max_count
 metadata_table_handles_opened	2	NULL	2	NULL	NULL	0	disabled
 metadata_table_handles_closed	1	NULL	1	NULL	NULL	0	disabled
 metadata_table_reference_count	NULL	NULL	0	NULL	NULL	0	disabled
-metadata_mem_pool_size	1048576	1048576	0	NULL	NULL	0	disabled
+metadata_mem_pool_size	NULL	NULL	0	NULL	NULL	0	disabled
 set global innodb_monitor_reset_all = module_metadata;
 select name, max_count, min_count, count,
 max_count_reset, min_count_reset, count_reset, status
@@ -2133,6 +2136,8 @@ icp_no_match	0
 icp_out_of_range	1
 icp_match	1
 drop table monitor_test;
+set global innodb_monitor_disable = all;
+set global innodb_monitor_reset_all = all;
 set global innodb_monitor_enable = default;
 set global innodb_monitor_disable = default;
 set global innodb_monitor_reset = default;

=== modified file 'mysql-test/suite/innodb/t/innodb_monitor.test'
--- a/mysql-test/suite/innodb/t/innodb_monitor.test	2011-02-28 09:35:01 +0000
+++ b/mysql-test/suite/innodb/t/innodb_monitor.test	2011-11-18 15:19:17 +0000
@@ -4,6 +4,8 @@
 
 --source include/have_innodb.inc
 
+set global innodb_monitor_disable = All;
+
 # Test turn on/off the monitor counter  with "all" option
 # By default, they will be off
 select name, status from information_schema.innodb_metrics;
@@ -100,6 +102,11 @@ set global innodb_monitor_enable="";
 --error ER_WRONG_VALUE_FOR_VAR
 set global innodb_monitor_enable="_";
 
+# Reset counters only in "module_metadata" module
+set global innodb_monitor_disable = module_metadata;
+
+set global innodb_monitor_reset_all = module_metadata;
+
 # Only turn on "table_open" counter
 set global innodb_monitor_enable = metadata_table_handles_opened;
 
@@ -362,6 +369,9 @@ where name like "icp%";
 
 drop table monitor_test;
 
+set global innodb_monitor_disable = all;
+set global innodb_monitor_reset_all = all;
+
 -- disable_warnings
 set global innodb_monitor_enable = default;
 set global innodb_monitor_disable = default;

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2011-08-03 18:22:00 +0000
+++ b/mysql-test/t/disabled.def	2011-11-18 13:22:19 +0000
@@ -1,4 +1,4 @@
-##############################################################################
+201##############################################################################
 #
 #  List the test cases that are to be disabled temporarily.
 #
@@ -17,3 +17,4 @@ create-big               : Bug#11748731 
 archive-big              : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc
 log_tables-big           : Bug#11756699 2010-11-15 mattiasj report already exists
 mysql_embedded           : Bug#12561297 2011-05-14 Anitha Dependent on PB2 changes - eventum#41836
+file_contents            : Bug#12585902 2011-09-27 magnus file_contents.test fails when building from "bzr export"

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (magnus.blaudd:3437 to 3439) magnus.blaudd21 Nov