← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to lib/DBServer/MySQL/MySQLd.pm

Delete socket file on server stop, look for boot-sql more places

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/DBServer/MySQL/MySQLd.pm
117
117
                      "fill_help_tables.sql") {
118
118
        push(@{$self->[MYSQLD_BOOT_SQL]}, 
119
119
             $self->_find(defined $source?[$self->basedir,$source]:[$self->basedir],
120
 
                          ["scripts","share/mysql"], $file));
 
120
                          ["scripts","share","share/mysql"], $file));
121
121
    }
122
122
    
123
123
    $self->[MYSQLD_MESSAGES] = 
359
359
            say("Killed process ".$self->serverpid);
360
360
        }
361
361
    }
 
362
    if (-e $self->socketfile) {
 
363
        unlink $self->socketfile;
 
364
    }
362
365
}
363
366
 
364
367
sub crash {
398
401
        if (!$r or $waits >= 100) {
399
402
            say("Server would not shut down properly");
400
403
            $self->kill;
 
404
        } else {
 
405
            unlink $self->socketfile;
401
406
        }
402
407
    } else {
403
408
        $self->kill;