From: Christopher Powers Date: March 1 2011 5:25pm Subject: bzr push into mysql-trunk branch (chris.powers:3240 to 3241) WL#4896 List-Archive: http://lists.mysql.com/commits/132233 Message-Id: <20110301172532.76E511DB0335@xeno.mysql.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2669470268203045063==" --===============2669470268203045063== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3241 Christopher Powers 2011-02-28 WL#4896 "Performance Schema Net IO" - Update miscellaneous regression tests modified: mysql-test/r/mysqld--help-notwin.result mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result mysql-test/suite/sys_vars/r/all_vars.result mysql-test/suite/sys_vars/r/pfs_max_sockets_basic.result mysql-test/suite/sys_vars/t/pfs_max_sockets_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_sockets_basic.test 3240 cpowers 2011-02-26 WL#4896 "Performance Schema Net IO" - Updated perfschema regression suite with DDL and DML tests for socket_* tables. modified: mysql-test/suite/perfschema/r/all_tests.result mysql-test/suite/perfschema/r/start_server_no_cond_class.result mysql-test/suite/perfschema/r/start_server_no_cond_inst.result mysql-test/suite/perfschema/r/start_server_no_file_class.result mysql-test/suite/perfschema/r/start_server_no_file_inst.result mysql-test/suite/perfschema/r/start_server_no_mutex_class.result mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result mysql-test/suite/perfschema/r/start_server_no_setup_actors.result mysql-test/suite/perfschema/r/start_server_no_setup_objects.result mysql-test/suite/perfschema/r/start_server_no_table_hdl.result mysql-test/suite/perfschema/r/start_server_no_table_inst.result mysql-test/suite/perfschema/r/start_server_no_thread_class.result mysql-test/suite/perfschema/r/start_server_no_thread_inst.result mysql-test/suite/perfschema/r/start_server_off.result mysql-test/suite/perfschema/r/start_server_on.result === modified file 'mysql-test/r/mysqld--help-notwin.result' --- a/mysql-test/r/mysqld--help-notwin.result 2011-02-23 21:13:48 +0000 +++ b/mysql-test/r/mysqld--help-notwin.result 2011-02-28 16:24:05 +0000 @@ -450,7 +450,7 @@ The following options may be given as th Maximum number of instrumented RWLOCK objects. --performance-schema-max-socket-classes=# Maximum number of socket instruments. - --performance-schema-max-sockets=# + --performance-schema-max-socket-instances=# Maximum number of opened instrumented sockets. --performance-schema-max-table-handles=# Maximum number of opened instrumented tables. @@ -900,7 +900,7 @@ performance-schema-max-mutex-instances 1 performance-schema-max-rwlock-classes 30 performance-schema-max-rwlock-instances 1000000 performance-schema-max-socket-classes 50 -performance-schema-max-sockets 10000 +performance-schema-max-socket-instances 10000 performance-schema-max-table-handles 10000 performance-schema-max-table-instances 1000 performance-schema-max-thread-classes 50 === modified file 'mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result' --- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result 2011-02-22 05:37:44 +0000 +++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result 2011-02-28 16:24:05 +0000 @@ -18,20 +18,23 @@ ERROR 1050 (42S01) at line 177: Table 'e ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 484: Table 'threads' already exists -ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 312: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 401: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 410: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 424: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 434: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 444: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 453: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 461: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 470: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 480: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 488: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 533: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 577: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 656: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 676: Table 'threads' already exists +ERROR 1644 (HY000) at line 1096: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_table"; Tables_in_performance_schema (user_table) @@ -54,20 +57,23 @@ ERROR 1050 (42S01) at line 177: Table 'e ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 484: Table 'threads' already exists -ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 312: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 401: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 410: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 424: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 434: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 444: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 453: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 461: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 470: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 480: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 488: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 533: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 577: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 656: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 676: Table 'threads' already exists +ERROR 1644 (HY000) at line 1096: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_view"; Tables_in_performance_schema (user_view) @@ -88,20 +94,23 @@ ERROR 1050 (42S01) at line 177: Table 'e ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 484: Table 'threads' already exists -ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 312: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 401: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 410: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 424: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 434: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 444: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 453: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 461: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 470: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 480: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 488: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 533: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 577: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 656: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 676: Table 'threads' already exists +ERROR 1644 (HY000) at line 1096: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -122,20 +131,23 @@ ERROR 1050 (42S01) at line 177: Table 'e ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 484: Table 'threads' already exists -ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 312: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 401: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 410: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 424: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 434: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 444: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 453: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 461: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 470: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 480: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 488: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 533: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 577: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 656: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 676: Table 'threads' already exists +ERROR 1644 (HY000) at line 1096: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -156,20 +168,23 @@ ERROR 1050 (42S01) at line 177: Table 'e ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 484: Table 'threads' already exists -ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 312: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 401: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 410: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 424: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 434: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 444: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 453: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 461: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 470: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 480: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 488: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 533: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 577: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 656: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 676: Table 'threads' already exists +ERROR 1644 (HY000) at line 1096: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.event where db='performance_schema'; name === modified file 'mysql-test/suite/sys_vars/r/all_vars.result' --- a/mysql-test/suite/sys_vars/r/all_vars.result 2011-02-23 21:13:48 +0000 +++ b/mysql-test/suite/sys_vars/r/all_vars.result 2011-02-28 16:24:05 +0000 @@ -17,6 +17,7 @@ INNODB_ROLLBACK_SEGMENTS INNODB_STATS_PERSISTENT_SAMPLE_PAGES RELAY_LOG_BASENAME LOG_BIN_BASENAME +PFS_MAX_SOCKET_INSTANCES INNODB_MONITOR_RESET INNODB_ANALYZE_IS_PERSISTENT INNODB_PRINT_ALL_DEADLOCKS @@ -31,6 +32,7 @@ INNODB_ROLLBACK_SEGMENTS INNODB_STATS_PERSISTENT_SAMPLE_PAGES RELAY_LOG_BASENAME LOG_BIN_BASENAME +PFS_MAX_SOCKET_INSTANCES INNODB_MONITOR_RESET INNODB_ANALYZE_IS_PERSISTENT INNODB_PRINT_ALL_DEADLOCKS === modified file 'mysql-test/suite/sys_vars/r/pfs_max_sockets_basic.result' --- a/mysql-test/suite/sys_vars/r/pfs_max_sockets_basic.result 2010-12-09 15:50:04 +0000 +++ b/mysql-test/suite/sys_vars/r/pfs_max_sockets_basic.result 2011-02-28 16:24:05 +0000 @@ -1,23 +1,23 @@ -select @@global.performance_schema_max_sockets; -@@global.performance_schema_max_sockets +select @@global.performance_schema_max_socket_instances; +@@global.performance_schema_max_socket_instances 123 -select @@session.performance_schema_max_sockets; -ERROR HY000: Variable 'performance_schema_max_sockets' is a GLOBAL variable -show global variables like 'performance_schema_max_sockets'; +select @@session.performance_schema_max_socket_instances; +ERROR HY000: Variable 'performance_schema_max_socket_instances' is a GLOBAL variable +show global variables like 'performance_schema_max_socket_instances'; Variable_name Value -performance_schema_max_sockets 123 -show session variables like 'performance_schema_max_sockets'; +performance_schema_max_socket_instances 123 +show session variables like 'performance_schema_max_socket_instances'; Variable_name Value -performance_schema_max_sockets 123 +performance_schema_max_socket_instances 123 select * from information_schema.global_variables -where variable_name='performance_schema_max_sockets'; +where variable_name='performance_schema_max_socket_instances'; VARIABLE_NAME VARIABLE_VALUE -PERFORMANCE_SCHEMA_MAX_SOCKETS 123 +PERFORMANCE_SCHEMA_MAX_SOCKET_INSTANCES 123 select * from information_schema.session_variables -where variable_name='performance_schema_max_sockets'; +where variable_name='performance_schema_max_socket_instances'; VARIABLE_NAME VARIABLE_VALUE -PERFORMANCE_SCHEMA_MAX_SOCKETS 123 -set global performance_schema_max_sockets=1; -ERROR HY000: Variable 'performance_schema_max_sockets' is a read only variable -set session performance_schema_max_sockets=1; -ERROR HY000: Variable 'performance_schema_max_sockets' is a read only variable +PERFORMANCE_SCHEMA_MAX_SOCKET_INSTANCES 123 +set global performance_schema_max_socket_instances=1; +ERROR HY000: Variable 'performance_schema_max_socket_instances' is a read only variable +set session performance_schema_max_socket_instances=1; +ERROR HY000: Variable 'performance_schema_max_socket_instances' is a read only variable === modified file 'mysql-test/suite/sys_vars/t/pfs_max_sockets_basic-master.opt' --- a/mysql-test/suite/sys_vars/t/pfs_max_sockets_basic-master.opt 2010-12-09 15:50:04 +0000 +++ b/mysql-test/suite/sys_vars/t/pfs_max_sockets_basic-master.opt 2011-02-28 16:24:05 +0000 @@ -1 +1 @@ ---loose-enable-performance-schema --loose-performance-schema-max-sockets=123 +--loose-enable-performance-schema --loose-performance-schema-max-socket-instances=123 === modified file 'mysql-test/suite/sys_vars/t/pfs_max_sockets_basic.test' --- a/mysql-test/suite/sys_vars/t/pfs_max_sockets_basic.test 2010-12-09 15:50:04 +0000 +++ b/mysql-test/suite/sys_vars/t/pfs_max_sockets_basic.test 2011-02-28 16:24:05 +0000 @@ -20,28 +20,28 @@ # Only global # -select @@global.performance_schema_max_sockets; +select @@global.performance_schema_max_socket_instances; --error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.performance_schema_max_sockets; +select @@session.performance_schema_max_socket_instances; -show global variables like 'performance_schema_max_sockets'; +show global variables like 'performance_schema_max_socket_instances'; -show session variables like 'performance_schema_max_sockets'; +show session variables like 'performance_schema_max_socket_instances'; select * from information_schema.global_variables - where variable_name='performance_schema_max_sockets'; + where variable_name='performance_schema_max_socket_instances'; select * from information_schema.session_variables - where variable_name='performance_schema_max_sockets'; + where variable_name='performance_schema_max_socket_instances'; # # Read-only # --error ER_INCORRECT_GLOBAL_LOCAL_VAR -set global performance_schema_max_sockets=1; +set global performance_schema_max_socket_instances=1; --error ER_INCORRECT_GLOBAL_LOCAL_VAR -set session performance_schema_max_sockets=1; +set session performance_schema_max_socket_instances=1; --===============2669470268203045063== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/chris.powers@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chris.powers@stripped # target_branch: file:///home/cpowers/work/dev/base_mysql-trunk-\ # wl4896/ # testament_sha1: fa60c430c91d119bfac8743da69d41516bfa03cb # timestamp: 2011-03-01 11:25:32 -0600 # base_revision_id: cpowers@tma-1-20110227024611-zojadsywzvc5jbrt # # Begin bundle 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 wnHX54fbPLR/F3JFOFCQAohNoQ== --===============2669470268203045063==--