From: Andrei Elkin Date: December 21 2010 8:12pm Subject: bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3256) WL#5569 List-Archive: http://lists.mysql.com/commits/127474 Message-Id: <201012212012.oBLKCbfN020377@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1678536749==" --===============1678536749== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-mr-wl5569/ based on revid:andrei.elkin@stripped 3256 Andrei Elkin 2010-12-21 wl#5569 MTS slave_worker_info def is updated in the system db. modified: scripts/mysql_system_tables.sql === modified file 'scripts/mysql_system_tables.sql' --- a/scripts/mysql_system_tables.sql 2010-12-21 17:30:50 +0000 +++ b/scripts/mysql_system_tables.sql 2010-12-21 20:12:30 +0000 @@ -104,7 +104,7 @@ CREATE TABLE IF NOT EXISTS slave_relay_l CREATE TABLE IF NOT EXISTS slave_master_info (Master_id INTEGER UNSIGNED NOT NULL, Number_of_lines INTEGER UNSIGNED NOT NULL, Master_log_name TEXT CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, Master_log_pos BIGINT UNSIGNED NOT NULL, Host TEXT CHARACTER SET utf8 COLLATE utf8_bin, User_name TEXT CHARACTER SET utf8 COLLATE utf8_bin, User_password TEXT CHARACTER SET utf8 COLLATE utf8_bin, Port INTEGER UNSIGNED NOT NULL, Connect_retry INTEGER UNSIGNED NOT NULL, Enabled_ssl BOOLEAN NOT NULL, Ssl_ca TEXT CHARACTER SET utf8 COLLATE utf8_bin, Ssl_capath TEXT CHARACTER SET utf8 COLLATE utf8_bin, Ssl_cert TEXT CHARACTER SET utf8 COLLATE utf8_bin, Ssl_cipher TEXT CHARACTER SET utf8 COLLATE utf8_bin, Ssl_key TEXT CHARACTER SET utf8 COLLATE utf8_bin, Ssl_verify_servert_cert BOOLEAN NOT NULL, Heartbeat FLOAT NOT NULL, Bind TEXT CHARACTER SET utf8 COLLATE utf8_bin, Ignored_server_ids TEXT CHARACTER SET utf8 COLLATE utf8_bin, Uuid TEXT CHARACTER SET utf8 COLLATE utf8_bin, Retry_count BIGIN! T UNSIGNED NOT NULL, PRIMARY KEY(Master_id)) ENGINE=MYISAM DEFAULT CHARSET=utf8 COMMENT 'Master Information'; -CREATE TABLE IF NOT EXISTS slave_worker_info (Master_id INTEGER UNSIGNED NOT NULL, Worker_id INTEGER UNSIGNED NOT NULL, Relay_log_name TEXT CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, Relay_log_pos BIGINT UNSIGNED NOT NULL, Master_log_name TEXT CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, Master_log_pos BIGINT UNSIGNED NOT NULL, Checkpoint_relay_log_name TEXT CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, Checkpoint_relay_log_pos BIGINT UNSIGNED NOT NULL, Checkpoint_master_log_name TEXT CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, Checkpoint_master_log_pos BIGINT UNSIGNED NOT NULL, Checkpoint_group_size INTEGER UNSIGNED NOT NULL, Checkpoint_group_bitmap BLOB NOT NULL, PRIMARY KEY(Master_id, Worker_id)) ENGINE=MYISAM DEFAULT CHARSET=utf8 COMMENT 'Worker Information'; +CREATE TABLE IF NOT EXISTS slave_worker_info (Master_id INTEGER UNSIGNED NOT NULL, Worker_id INTEGER UNSIGNED NOT NULL, Relay_log_name TEXT CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, Relay_log_pos BIGINT UNSIGNED NOT NULL, Master_log_name TEXT CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, Master_log_pos BIGINT UNSIGNED NOT NULL, Checkpoint_relay_log_name TEXT CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, Checkpoint_relay_log_pos BIGINT UNSIGNED NOT NULL, Checkpoint_master_log_name TEXT CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, Checkpoint_master_log_pos BIGINT UNSIGNED NOT NULL, Checkpoint_seqno INT UNSIGNED NOT NULL, Checkpoint_group_size INTEGER UNSIGNED NOT NULL, Checkpoint_group_bitmap BLOB NOT NULL, PRIMARY KEY(Master_id, Worker_id)) ENGINE=MYISAM DEFAULT CHARSET=utf8 COMMENT 'Worker Information'; -- -- PERFORMANCE SCHEMA INSTALLATION --===============1678536749== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/andrei.elkin@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@stripped # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\ # mr-wl5569/ # testament_sha1: bc10b6546e8b7720b9fc9266f1c330010b8db7c6 # timestamp: 2010-12-21 22:12:37 +0200 # base_revision_id: andrei.elkin@stripped\ # dha63d1348f3trsz # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXJitN0AAcPfgAAQWOf//3/v 3uC////wUATB3gGhs02CuhCSSajJhNNGk09NSeaUaPRPUz0mUzKeoepkPKAGVRoG1B6I9IBoDCNA AAAAAcZMmTEYmAEyYJkANGEYAhgEipoJ6o09R6TQyMj1BoDQDQNAD1AAkoAgTExBqbRT0RqeKNDa j0g9RofqjR6j1NU+Xpbz4n6yU3mU9LoAOmB1wkc62OGfdEzMenFc33WJa2gdBd5h+ZUWIrS8MT5t VHHic/ppkNetUMzDWuc0yFcXyCaUHPQw85X7nL+4D8ZsLL3aIoDBlnDAFvX7WzOz7E5kNe7TqazP TwQmtMojtJhYYlJpKi/yhkrrjHlSRhsxCJrtMaLcd+cTqFqwdy+hTCGJ7vASFDsZEyBJyvHt99ZF gVdcRHlEgrTblWDXUDhTAJsvdr9Zq5fSfXVK/ls6nInA1mNGthEf5G5ghwvCYiGFBAQ0dWOE3KBR I9M906JXOD4E8i9+6UAK86VFP3ksq2l6oKSjmttSfVE4E4QL7yRngmRiWPWweXlPD0qzK50byrcX u8tAfdEg1cxQeHM2mvwO2GrHOq8ccDODVuq3uDbGouwV2p/LEVt0A5Otebi/gmzssUae0WIwVqKr VZmo14xskKNsbI6qgi8p1JvULY/LKJdUqbnNZbYS9nGqNOJhhSFjXygyOto8amRY8mEZMd8dneZK Y/VkgY7u/Fvz54hFzYHhxR5R6w8ur74qEzNSH1aJhDnA1JwDJ2I6aptA/J6jY0P3VyHuDo3pWFDQ XRD+4JgWUvYDF5/20uQEvmhYg1uFd8JfLoNIVgXuEqAGvAchVXIvEnQSrB/zaPMSbQ1zAcy8KbRJ yKkSoQ5VA4LsHoUHgdjCSLboxB34jKFcmCAwfi2McD7AZ3ekhafSt5RMd0NvaOXcbTf4n2lU1CRG bSb47sN0LZehEj3rYbRncn9GPAisgYZeLFQrYN+TgZ3U43L0P2i+qK9wZis4SX3+ba/9hoaMsZSk 1I6JGpjTlzPlIkMNV0dimdhGtRTYTzes2oiimTzTeSIauyqwLOxgUFA0OSGJ8WPLpZ0cIYiWwZKu KquyZqtF7rSMbX59DV83Fz4M0wicIDCmq7Kap4NtjCXDSta+RCqhVClz9I0VgOKhBNegVbIvOPAt O/s7L08ac3Y4DuYFupGf0HMuMwwWVPilUe8mMsFrW1ImcWnCQzC0PcxM752neZpxu594NaJW0mtL z02Qtp2hfVvCzrgaevhoUIekXhe9J4sz+WHq1vAHVBQ4IJw0OuaQwlqXM8YiMuq0DQVkLhFzGrZE eFKN2oym95xYw8YpQXuGNEMoDOcoZJBE1qVZZJb3OaE42hptNbO0VuDLkboGNB7dAUkaSP+SN4eq 5lYTpgmBjMw6ua4m/RjE15JQaJRUAjR5YnP4LEwimGEwyCkk21UiQpgSCE2mgiLfUi0Xa0NsMvcP eptAyc5ZCbjxfRanNkDCJrZae34s+36gqGBkKtF5OpbFDTv7BchPeA8isGvaFzBUE+SBsNlVg7GY Vh9itk5Qy0VJVQwP4YHp8OBdEZaVrTcDG5YcNpjIOeSpD2HV1haHd1x35wGMZ3Vko/i7kinChIOT Fabo --===============1678536749==--