diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-05-26 21:55:40 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-05-26 21:55:40 +0300 |
| commit | 4aa9d903c11554cc4887eeffe7f0592c52e8bc99 (patch) | |
| tree | af3f0dfb833c3c4aabaa69ce50cfb64202ecd479 /scripts/mysqlhotcopy.sh | |
| parent | 9febcb4776e563a93eb8fff247174b0e2eb2ae0b (diff) | |
| parent | af6d89a6aa9feb3545de068f461cf91bfb281dd2 (diff) | |
| download | mariadb-git-4aa9d903c11554cc4887eeffe7f0592c52e8bc99.tar.gz | |
Merge with MySQL 5.1.47
Fixed some bugs introduced in 5.1.47
Disabled some tests until we have merged with latest Xtradb
configure.in:
Added testing if valgrind/memcheck.h exists
storage/pbxt/src/ha_pbxt.cc:
LOCK_plugin is not anymore locked in init
Diffstat (limited to 'scripts/mysqlhotcopy.sh')
| -rw-r--r-- | scripts/mysqlhotcopy.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/scripts/mysqlhotcopy.sh b/scripts/mysqlhotcopy.sh index 21fca0c0848..398573875d9 100644 --- a/scripts/mysqlhotcopy.sh +++ b/scripts/mysqlhotcopy.sh @@ -267,6 +267,14 @@ 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|schema|general_log|slow_log)$/ } @dbh_tables + } + ## generate regex for tables/files my $t_regex; my $negated; |