diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-12-21 18:18:27 -0700 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-12-21 18:18:27 -0700 |
| commit | 454b7d0f52e174b8025f1da889f6014646a57786 (patch) | |
| tree | ac746a1b866ec284eeeab01c529579022d826faf /mysql-test/lib | |
| parent | 2218cbb059029395314c31efc963dc93562c041d (diff) | |
| parent | 8ca9c9288039db167a115cadae1d514ed9ac47e3 (diff) | |
| download | mariadb-git-454b7d0f52e174b8025f1da889f6014646a57786.tar.gz | |
Merge siva.hindu.god:/usr/home/tim/m/bk/g41
into siva.hindu.god:/usr/home/tim/m/bk/41
scripts/mysqld_multi.sh:
Auto merged
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/mtr_unique.pl | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mysql-test/lib/mtr_unique.pl b/mysql-test/lib/mtr_unique.pl index a8fb320c773..3adc8413576 100644 --- a/mysql-test/lib/mtr_unique.pl +++ b/mysql-test/lib/mtr_unique.pl @@ -10,10 +10,16 @@ use Fcntl ':flock'; # Requested IDs are stored in a hash and released upon END. # my %mtr_unique_assigned_ids = (); +my $mtr_unique_pid; +BEGIN { + $mtr_unique_pid = $$ unless defined $mtr_unique_pid; +} END { - while(my ($id,$file) = each(%mtr_unique_assigned_ids)) { - print "Autoreleasing $file:$id\n"; - mtr_release_unique_id($file, $id); + if($mtr_unique_pid == $$) { + while(my ($id,$file) = each(%mtr_unique_assigned_ids)) { + print "Autoreleasing $file:$id\n"; + mtr_release_unique_id($file, $id); + } } } |