1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge ramayana.hindu.god:/home/tsmith/m/bk/51

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


client/mysql_upgrade.c:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_show.cc:
  Auto merged
This commit is contained in:
unknown
2007-08-27 18:20:54 -06:00
279 changed files with 19651 additions and 14562 deletions

View File

@ -4135,7 +4135,7 @@ sub stop_all_servers () {
my $pid;
# Start shutdown of all started masters
foreach my $mysqld (@{$master}, @{$slave})
foreach my $mysqld (@{$slave}, @{$master})
{
if ( $mysqld->{'pid'} )
{