3271 Christopher Powers 2011-03-22
WL#4896 "Performance Schema Net IO"
- Correct unittest plan counts
modified:
storage/perfschema/unittest/pfs-t.cc
storage/perfschema/unittest/pfs_instr-oom-t.cc
storage/perfschema/unittest/pfs_instr-t.cc
storage/perfschema/unittest/pfs_instr_class-oom-t.cc
storage/perfschema/unittest/pfs_instr_class-t.cc
3270 Christopher Powers 2011-03-20 [merge]
merge with mysql-trunk
added:
mysql-test/r/optimizer_debug_sync.result
mysql-test/suite/innodb/r/innodb_bug11789106.result
mysql-test/suite/innodb/r/innodb_bug60196.result
mysql-test/suite/innodb/t/innodb_bug11789106.test
mysql-test/suite/innodb/t/innodb_bug60196-master.opt
mysql-test/suite/innodb/t/innodb_bug60196.test
mysql-test/suite/rpl/r/rpl_grant_plugin.result
mysql-test/suite/rpl/t/rpl_grant_plugin-master.opt
mysql-test/suite/rpl/t/rpl_grant_plugin-slave.opt
mysql-test/suite/rpl/t/rpl_grant_plugin.test
mysql-test/t/optimizer_debug_sync.test
modified:
README
client/mysqladmin.cc
client/mysqldump.c
client/mysqltest.cc
cmake/mysql_version.cmake
include/decimal.h
include/mysql.h.pp
include/typelib.h
mysql-test/extra/rpl_tests/rpl_stop_middle_group.test
mysql-test/include/have_plugin_auth.inc
mysql-test/include/icp_tests.inc
mysql-test/r/archive.result
mysql-test/r/cast.result
mysql-test/r/func_math.result
mysql-test/r/func_time.result
mysql-test/r/gis.result
mysql-test/r/grant.result
mysql-test/r/grant2.result
mysql-test/r/innodb_icp.result
mysql-test/r/innodb_icp_none.result
mysql-test/r/myisam_icp.result
mysql-test/r/myisam_icp_none.result
mysql-test/r/mysqladmin.result
mysql-test/r/mysqldump.result
mysql-test/r/plugin_auth.result
mysql-test/r/plugin_auth_qa.result
mysql-test/r/plugin_auth_qa_1.result
mysql-test/r/plugin_auth_qa_2.result
mysql-test/r/sp.result
mysql-test/r/sp_notembedded.result
mysql-test/r/subselect_innodb.result
mysql-test/r/system_mysql_db.result
mysql-test/r/type_date.result
mysql-test/r/union.result
mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result
mysql-test/suite/funcs_1/r/is_columns_mysql.result
mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_user_privileges.result
mysql-test/suite/innodb/include/innodb_stats_bootstrap.inc
mysql-test/suite/innodb/r/innodb_monitor.result
mysql-test/suite/innodb/t/innodb_monitor.test
mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result
mysql-test/suite/large_tests/t/rpl_slave_net_timeout.test
mysql-test/suite/perfschema/r/server_init.result
mysql-test/suite/perfschema/t/server_init.test
mysql-test/suite/rpl/r/rpl_checksum_cache.result
mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result
mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
mysql-test/suite/rpl/r/rpl_ignore_table.result
mysql-test/suite/rpl/r/rpl_slow_query_log.result
mysql-test/suite/rpl/r/rpl_stm_000001.result
mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result
mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result
mysql-test/suite/rpl/r/rpl_stop_slave.result
mysql-test/suite/rpl/t/rpl_checksum_cache.test
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test
mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
mysql-test/suite/rpl/t/rpl_semi_sync.test
mysql-test/suite/rpl/t/rpl_slow_query_log.test
mysql-test/suite/rpl/t/rpl_stm_start_stop_slave.test
mysql-test/suite/rpl/t/rpl_stop_slave.test
mysql-test/suite/sys_vars/r/optimizer_switch_basic.result
mysql-test/suite/sys_vars/t/optimizer_switch_basic.test
mysql-test/t/archive.test
mysql-test/t/cast.test
mysql-test/t/func_math.test
mysql-test/t/func_time.test
mysql-test/t/gis.test
mysql-test/t/mysql_client_test-master.opt
mysql-test/t/mysql_client_test.test
mysql-test/t/mysqladmin.test
mysql-test/t/mysqldump.test
mysql-test/t/plugin_auth.test
mysql-test/t/sp.test
mysql-test/t/subselect_innodb.test
mysql-test/t/type_date.test
mysys/default.c
mysys/my_getopt.c
mysys/my_init.c
mysys/my_thr_init.c
mysys/mysys_priv.h
mysys/typelib.c
scripts/mysql_system_tables.sql
scripts/mysql_system_tables_fix.sql
sql-common/client.c
sql-common/client_plugin.c
sql/ha_partition.cc
sql/item.cc
sql/item.h
sql/item_func.h
sql/item_subselect.cc
sql/item_subselect.h
sql/item_sum.cc
sql/item_timefunc.cc
sql/my_decimal.h
sql/mysqld.cc
sql/mysqld.h
sql/opt_range.cc
sql/rpl_slave.cc
sql/sql_acl.cc
sql/sql_base.cc
sql/sql_db.cc
sql/sql_handler.cc
sql/sql_help.cc
sql/sql_lex.h
sql/sql_select.cc
sql/sql_select.h
sql/sql_union.cc
sql/strfunc.cc
sql/table.cc
storage/archive/ha_archive.cc
storage/innobase/CMakeLists.txt
storage/innobase/btr/btr0cur.c
storage/innobase/btr/btr0sea.c
storage/innobase/buf/buf0buf.c
storage/innobase/buf/buf0flu.c
storage/innobase/buf/buf0lru.c
storage/innobase/dict/dict0load.c
storage/innobase/dict/dict0stats.c
storage/innobase/fil/fil0fil.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/i_s.cc
storage/innobase/handler/i_s.h
storage/innobase/include/buf0buf.h
storage/innobase/include/buf0buf.ic
storage/innobase/include/buf0flu.h
storage/innobase/include/buf0flu.ic
storage/innobase/include/data0type.ic
storage/innobase/include/fil0fil.h
storage/innobase/include/ha_prototypes.h
storage/innobase/include/log0log.h
storage/innobase/include/log0log.ic
storage/innobase/include/log0recv.h
storage/innobase/include/mtr0mtr.h
storage/innobase/include/srv0mon.h
storage/innobase/include/srv0srv.h
storage/innobase/include/srv0start.h
storage/innobase/include/trx0trx.h
storage/innobase/include/univ.i
storage/innobase/lock/lock0lock.c
storage/innobase/log/log0log.c
storage/innobase/log/log0recv.c
storage/innobase/mem/mem0dbg.c
storage/innobase/mtr/mtr0mtr.c
storage/innobase/page/page0zip.c
storage/innobase/row/row0mysql.c
storage/innobase/row/row0sel.c
storage/innobase/scripts/persistent_storage.sql
storage/innobase/srv/srv0mon.c
storage/innobase/srv/srv0srv.c
storage/innobase/srv/srv0start.c
storage/innobase/sync/sync0arr.c
storage/innobase/sync/sync0rw.c
storage/innobase/sync/sync0sync.c
storage/innobase/trx/trx0sys.c
storage/innobase/trx/trx0trx.c
storage/innobase/ut/ut0dbg.c
storage/myisam/myisamchk.c
storage/myisammrg/myrg_open.c
strings/decimal.c
tests/mysql_client_test.c
unittest/gunit/item-t.cc
=== modified file 'storage/perfschema/unittest/pfs-t.cc'
--- a/storage/perfschema/unittest/pfs-t.cc 2011-03-21 02:01:31 +0000
+++ b/storage/perfschema/unittest/pfs-t.cc 2011-03-22 15:29:28 +0000
@@ -1584,7 +1584,7 @@ void do_all_tests()
int main(int, char **)
{
- plan(179);
+ plan(213);
MY_INIT("pfs-t");
do_all_tests();
return 0;
=== modified file 'storage/perfschema/unittest/pfs_instr-oom-t.cc'
--- a/storage/perfschema/unittest/pfs_instr-oom-t.cc 2011-03-21 02:01:31 +0000
+++ b/storage/perfschema/unittest/pfs_instr-oom-t.cc 2011-03-22 15:29:28 +0000
@@ -274,7 +274,7 @@ void do_all_tests()
int main(int, char **)
{
- plan(8);
+ plan(9);
MY_INIT("pfs_instr-oom-t");
do_all_tests();
return 0;
=== modified file 'storage/perfschema/unittest/pfs_instr-t.cc'
--- a/storage/perfschema/unittest/pfs_instr-t.cc 2011-03-21 02:01:31 +0000
+++ b/storage/perfschema/unittest/pfs_instr-t.cc 2011-03-22 15:29:28 +0000
@@ -377,7 +377,7 @@ void do_all_tests()
int main(int, char **)
{
- plan(91);
+ plan(103);
MY_INIT("pfs_instr-t");
do_all_tests();
return 0;
=== modified file 'storage/perfschema/unittest/pfs_instr_class-oom-t.cc'
--- a/storage/perfschema/unittest/pfs_instr_class-oom-t.cc 2011-03-21 02:01:31 +0000
+++ b/storage/perfschema/unittest/pfs_instr_class-oom-t.cc 2011-03-22 15:29:28 +0000
@@ -59,7 +59,7 @@ void do_all_tests()
int main(int, char **)
{
- plan(6);
+ plan(7);
MY_INIT("pfs_instr_info-oom-t");
do_all_tests();
return 0;
=== modified file 'storage/perfschema/unittest/pfs_instr_class-t.cc'
--- a/storage/perfschema/unittest/pfs_instr_class-t.cc 2011-03-21 02:01:31 +0000
+++ b/storage/perfschema/unittest/pfs_instr_class-t.cc 2011-03-22 15:29:28 +0000
@@ -670,7 +670,7 @@ void do_all_tests()
int main(int, char **)
{
- plan(146);
+ plan(181);
MY_INIT("pfs_instr_info-t");
do_all_tests();
return 0;
Attachment: [text/bzr-bundle] bzr/chris.powers@oracle.com-20110322152928-28v2crtb832dbl0z.bundle
| Thread |
|---|
| • bzr push into mysql-trunk branch (chris.powers:3270 to 3271) WL#4896 | Christopher Powers | 22 Mar |
