From: Marc Alff
Date: June 14 2010 7:07am
Subject: bzr commit into mysql-next-mr branch (marc.alff:3151)
List-Archive: http://lists.mysql.com/commits/110975
Message-Id: <201006140708.o5E6xXEL024440@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7024875133170854584=="

--===============7024875133170854584==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/malff/BZR_TREE/mysql-next-mr-wl4674/ based on revid:marc.alff@stripped

 3151 Marc Alff	2010-06-14
      Fixed unit tests (missing initialization for m_setup_actor_sizing)

    modified:
      storage/perfschema/unittest/pfs-t.cc
      storage/perfschema/unittest/pfs_instr-oom-t.cc
      storage/perfschema/unittest/pfs_instr-t.cc
=== modified file 'storage/perfschema/unittest/pfs-t.cc'
--- a/storage/perfschema/unittest/pfs-t.cc	2010-05-03 15:04:02 +0000
+++ b/storage/perfschema/unittest/pfs-t.cc	2010-06-14 07:06:59 +0000
@@ -94,6 +94,7 @@ void test_bootstrap()
   param.m_file_handle_sizing= 0;
   param.m_events_waits_history_sizing= 0;
   param.m_events_waits_history_long_sizing= 0;
+  param.m_setup_actor_sizing= 0;
 
   boot= initialize_performance_schema(& param);
   ok(boot != NULL, "boot");
@@ -136,6 +137,7 @@ PSI * load_perfschema()
   param.m_file_handle_sizing= 50;
   param.m_events_waits_history_sizing= 10;
   param.m_events_waits_history_long_sizing= 10;
+  param.m_setup_actor_sizing= 0;
 
   /* test_bootstrap() covered this, assuming it just works */
   boot= initialize_performance_schema(& param);

=== modified file 'storage/perfschema/unittest/pfs_instr-oom-t.cc'
--- a/storage/perfschema/unittest/pfs_instr-oom-t.cc	2010-05-03 15:04:02 +0000
+++ b/storage/perfschema/unittest/pfs_instr-oom-t.cc	2010-06-14 07:06:59 +0000
@@ -45,6 +45,7 @@ void test_oom()
   param.m_file_handle_sizing= 0;
   param.m_events_waits_history_sizing= 0;
   param.m_events_waits_history_long_sizing= 0;
+  param.m_setup_actor_sizing= 0;
 
   rc= init_instruments(& param);
   ok(rc == 1, "oom (mutex)");
@@ -65,6 +66,7 @@ void test_oom()
   param.m_file_handle_sizing= 0;
   param.m_events_waits_history_sizing= 0;
   param.m_events_waits_history_long_sizing= 0;
+  param.m_setup_actor_sizing= 0;
 
   rc= init_instruments(& param);
   ok(rc == 1, "oom (rwlock)");
@@ -85,6 +87,7 @@ void test_oom()
   param.m_file_handle_sizing= 0;
   param.m_events_waits_history_sizing= 0;
   param.m_events_waits_history_long_sizing= 0;
+  param.m_setup_actor_sizing= 0;
 
   rc= init_instruments(& param);
   ok(rc == 1, "oom (cond)");
@@ -105,6 +108,7 @@ void test_oom()
   param.m_file_handle_sizing= 1000;
   param.m_events_waits_history_sizing= 0;
   param.m_events_waits_history_long_sizing= 0;
+  param.m_setup_actor_sizing= 0;
 
   rc= init_instruments(& param);
   ok(rc == 1, "oom (file)");
@@ -125,6 +129,7 @@ void test_oom()
   param.m_file_handle_sizing= 0;
   param.m_events_waits_history_sizing= 0;
   param.m_events_waits_history_long_sizing= 0;
+  param.m_setup_actor_sizing= 0;
 
   rc= init_instruments(& param);
   ok(rc == 1, "oom (table)");
@@ -145,6 +150,7 @@ void test_oom()
   param.m_file_handle_sizing= 0;
   param.m_events_waits_history_sizing= 0;
   param.m_events_waits_history_long_sizing= 0;
+  param.m_setup_actor_sizing= 0;
 
   rc= init_instruments(& param);
   ok(rc == 1, "oom (thread)");
@@ -167,6 +173,7 @@ void test_oom()
   param.m_file_handle_sizing= 0;
   param.m_events_waits_history_sizing= 10;
   param.m_events_waits_history_long_sizing= 0;
+  param.m_setup_actor_sizing= 0;
 
   stub_alloc_fails_after_count= 2;
   rc= init_instruments(& param);
@@ -188,6 +195,7 @@ void test_oom()
   param.m_file_handle_sizing= 0;
   param.m_events_waits_history_sizing= 0;
   param.m_events_waits_history_long_sizing= 0;
+  param.m_setup_actor_sizing= 0;
 
   stub_alloc_fails_after_count= 2;
   rc= init_instruments(& param);

=== modified file 'storage/perfschema/unittest/pfs_instr-t.cc'
--- a/storage/perfschema/unittest/pfs_instr-t.cc	2010-05-03 15:04:02 +0000
+++ b/storage/perfschema/unittest/pfs_instr-t.cc	2010-06-14 07:06:59 +0000
@@ -43,6 +43,7 @@ void test_no_instruments()
   param.m_file_handle_sizing= 0;
   param.m_events_waits_history_sizing= 0;
   param.m_events_waits_history_long_sizing= 0;
+  param.m_setup_actor_sizing= 0;
 
   rc= init_instruments(& param);
   ok(rc == 0, "zero init");
@@ -83,6 +84,7 @@ void test_no_instances()
   param.m_file_handle_sizing= 0;
   param.m_events_waits_history_sizing= 0;
   param.m_events_waits_history_long_sizing= 0;
+  param.m_setup_actor_sizing= 0;
 
   rc= init_instruments(& param);
   ok(rc == 0, "no instances init");
@@ -196,6 +198,7 @@ void test_with_instances()
   param.m_file_handle_sizing= 100;
   param.m_events_waits_history_sizing= 10;
   param.m_events_waits_history_long_sizing= 10000;
+  param.m_setup_actor_sizing= 0;
 
   rc= init_instruments(& param);
   ok(rc == 0, "instances init");
@@ -355,6 +358,7 @@ void test_per_thread_wait()
   param.m_file_handle_sizing= 0;
   param.m_events_waits_history_sizing= 10;
   param.m_events_waits_history_long_sizing= 10000;
+  param.m_setup_actor_sizing= 0;
 
   rc= init_instruments(& param);
   ok(rc == 0, "instances init");


--===============7024875133170854584==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marc.alff@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-wl4674/
# testament_sha1: b16576e1ad845ac33cbc1db55ab2b80502f8a289
# timestamp: 2010-06-14 01:07:19 -0600
# source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr/
# base_revision_id: marc.alff@stripped\
#   2wlsw2mu3gsovvf7
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQ/I1OIAAxffgAAQUGP//3MC
AAC////wUAUWd7XKaB51Ih3vdZ4RSp6TSNqep6J4jQCMCGQAAkkDUyJ6aRqaGo0GjQ0DTQASJCaS
ZhTT1GTRoANAAAIpKbVPSPap6bUT1PUMQAAAAEVAoxDIp7TQNFGmnqemppo9TTTTV2xz3Em+sr0i
RxESmQg7b8I2QKqNmaj15PRb5TiUrGJV98V1KxNA22DZ6bBLwSXxS1lw299xKMGEY0mzDDNOttHB
iyM0Q5OGTnSW6/csPP98fL5xY2CyXGBnQrfLRe2ObW44TyWyEaE7993B9wDDBkh9UNmQ0id/3xcN
uOiRfVnQLEL0DIJaVdvTWS5MVeDbqA2LONI0RTVOkIFKwQsiEooTYm1owZ0ANYmOTKJpjHehUxSq
bYSlEpkVp2aGwh+FklAYd5RbpJAvDgTOw17aydA3jOk0Esqb67EPId+DZg1xHkiWe+iCnnf2CbRm
aL88rcGMDy3cstHIamz3Q8eHCFVPk1j2QbELbUHoU1h17dMy8UGUCpoci8jafNKgFDgOdsKuf1YV
cWeMbiefTpYvU9FKTrxbBOOBxiH8ToKKrNFygRNgTykcZwGzaWZ3V2oOWIcx3QZayZYORoX4mpMs
TcRBWrZVUxRjoK7zxzVoatSU2qIrqqTkRbKsXJ5qDtARv0dBeuWziInHbGXDKN9tkPfr5nE70Ft8
Xbj1RliGs3TiJDcjMppSzFLoxhGkQ6I32vM6rbQm1c6RGN3YiTjpmYC5pEsgjphmJkEjIzjmOnNL
rq4kC2hYm1syChcwci5muFLhrG2spZNSiWsQmQQztMJio7SF5BTxFyW4SCN7kkwN3R3ZUDDPREEM
Ee8aDerRJpeQ3hjxoVmHarIDXdaV4jOaS4/spm0BrtQPZXXoMS+g+KB1Ii7XCMH6ZhfbegRQhx7r
7SZjIWkWF8ocYWW7yRzdWxQrvueB0oSQPtbScInMmYmguOKFCwr638caoQQKkDTFW5znVDVzuK78
yUSyM1uK83IPASnn5OEASLadR5srjy1yKqzgQbXcyrg8IvVOEe6gw88Wz0v1T3qrrabIPWDWH8wn
DJbs06c0zETK4Bpks2bbj1kFJxIuJjUYEHUIWHWVB8u16OKHdYhEgDsXk4mAhTYh4IWAHCTuLOnm
sJ4hsQiaeg2aOSs6x9b9OWuoeI87u6EIwf9jkYQAcLxIUbR/+AWZRqkHFqQID78VDT6VtXRAoLwE
jt9BcB9T+hBjv2NbK44bs1KBzUkdHsJOqa2uWQyrCAemGvZQLUk2hqa6aIL3rALWMsS6K2Bbzq/q
BAyeyTn2uqiuCtYYTME8nKIiIq9OSq8LFeKkJBIS5MIPFMgy7rg/s+YiqzUrYlJhHUsLZ2ZVYBfF
uEpgMhDshUnPu/zN2Wg2gvAUId63pwVPPCiYPSdyDJ04qYW6jAOFaUQz4yuvLOVW4aMEQk5JrbQq
rg46r9jUSqtOtGj3tw6Wb/IZdTa6BPVCu6BpErbGe2cEn6If4u5IpwoSAfkanEA=


--===============7024875133170854584==--