From: Georgi Kodinov Date: April 8 2010 1:23pm Subject: bzr commit into mysql-5.1-bugteam branch (joro:3449) Bug#43594 List-Archive: http://lists.mysql.com/commits/105222 X-Bug: 43594 Message-Id: <201004081324.o38DO00m009003@magare.gmz> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0033943552531064875==" --===============0033943552531064875== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/kgeorge/mysql/work/B43594-5.1-bugteam/ based on revid:omer@stripped 3449 Georgi Kodinov 2010-04-08 Bug #43594: mysqlhotcopy does not ignore log tables and others in mysql database Added a filter to mysqlhotcopy to filter out the same tables in the 'mysql' database that mysqldump filters out. modified: scripts/mysqlhotcopy.sh === modified file 'scripts/mysqlhotcopy.sh' --- a/scripts/mysqlhotcopy.sh 2009-04-28 16:16:17 +0000 +++ b/scripts/mysqlhotcopy.sh 2010-04-08 13:23:54 +0000 @@ -267,6 +267,16 @@ foreach my $rdb ( @db_desc ) { my $db = $rdb->{src}; my @dbh_tables = get_list_of_tables( $db ); + ## filter out certain system non-lockable tables. + ## keep in sync with mysqldump. + if ($db =~ m/mysql/i) + { + @dbh_tables = grep { $_ !~ 'apply_status' } @dbh_tables; + @dbh_tables = grep { $_ !~ 'schema' } @dbh_tables; + @dbh_tables = grep { $_ !~ 'general_log' } @dbh_tables; + @dbh_tables = grep { $_ !~ 'slow_log' } @dbh_tables; + } + ## generate regex for tables/files my $t_regex; my $negated; --===============0033943552531064875== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/joro@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: joro@stripped # target_branch: file:///home/kgeorge/mysql/work/B43594-5.1-bugteam/ # testament_sha1: 6a183ce015bf618ed26ee42dbc3fdc1f2c3fa8c5 # timestamp: 2010-04-08 16:24:00 +0300 # base_revision_id: omer@stripped # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRbn++gAAd9fgFAQfeP//3KI AAC////7UASe5md26FRQ7AZwlIIAJkyaYmKnp5AEMpmhNNHqAaU2khsiP1TID1GgA0AAAACVNRiN FPZUyeIhk0AYjTE9I0x6kNDmmJgATABMAAJgACYJJAmQmRlKfsk8qnsmpmptSHqB4oGh+qHl7Jds Ppv40b2+D34WWZb+XZlWtBlazbJawgBSwdyqlkaoObrkFBMoM4aoBHkWofF/Ga7URDBsIrbLIWWL SWWIbMgTfK3Ubv4vefftjwrLgpqqajHUYHz77nwdGmriLU0NUkZgsaKZIwheunDEMQ7Xct+uSrF1 vOhXtcIvLBiIYHmTIet68bscFtRMpaDCAQq576YmvpW0gxcErPtnwzjdWYphclzxIQhD4xYNa8aC czYt+X2ERDhDxwesDgQEd26bKNThRqHD88QtE9Wo9WsohdLBk04HLkipAu1MPGEBLxGIwqFDJWV4 R8wbRKB6Y+SiYU8sH0XxguCp0U9oQIDB16RjrBtFdY0VOMkkshUHFxUXlR0Gt62TmKGT0FptWAz5 kI+fEdXIT87CMrzjpzL8SYnmIzV5lBmiKQKLCegoHCrSMOO68XjBwaLMsHnJan+2RulcYkFkmOru 8lgZS2LI9Ltk5KvcwnA9TO4dhDsKMNUxQWp3d/DM2VZKGcQiRO9VUG7CqlJrJIsT4lLwl1C48vY8 GF7sZBt+bbZno9/3ZD2Cry/o++98nFTPf+4VBWvTxYV5ImULO7FwP/QRpO+Jlg3N1neFLAgqtGBa VG8kIP88OPZkjSOwzCDT/OMdpKV93xSsXqbosbSnV3MmDGwpGgNBIckt4njXeFJ4kJIP9Oqc9L+q O2dmxXFEHtKDs4/eQ8aFopNYuISsic2dwPI/layjwLzRDbOzccqsmbV7GNUdOopF5iUxSu6AjJYS +EaExK2mKDpxz7h05k6Wd1XsmR23OCpUwdcsaWQ28AxFmyORtrVNgECMcllxRVZUNPRYssHjOe+O AjhU4xOG7VUkju3ETyZVhNGH9iacLLUwKwFgtiZ1rmvQ6UppTDs9cJhboKqu4jx8ayx9/AB0alyt wTP/PgxyEsA4Ed4Hba5bR6bU+rT1RVzxrSa0LCCc+RJRLFmbJi+ahiINQbyN+UkQZMwBE0MQiEDo lqJRMfKpK0WVoJ8wkhz7iaYDqow7LWBzrQGSkde+4qCOMB7oUq1aOsgcyGVj/Meb0uH/O6PX0TtU jHMdPqyXSiIIsCN2xe6XHMUlL5IxzZPwuPC1DcgaRryxVIlYXGl85jW3VI/AXQXHA2oXNZ4lzJUB oO8oC4hf137mT6qT006xEXx3hhNEWGQMibDb6niYZsC3z+WBy1n7pxeaANYvRVy5m9tEKsraj3h8 wGvLt2LnTbeeC08ZHjwM3l4Wpg4QNiJUfRb2mNk5VExwSCxfoNoxFlVJ7tNYoS7A+G7mkYHYRU8y b8RF2LJks0TWgM5DlnDZFbGJIWewk0iaG1tWC1qn8Kb8yCL4susnLx/i7GZruzXaCIHIOP+LuSKc KEgLc/30AA== --===============0033943552531064875==--