~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to lib/GenTest/Server/MySQLd.pm

Committer: Bernt M. Johnsen
Date: 2010-04-08 11:05:05 UTC
mto: (0.105.2 randgen-bugfixing) (2312.4.1 drizzle-randgen)
mto: This revision was merged to the branch mainline in revision 2435.
Revision ID: bernt.johnsen@sun.com-20100408110505-66z8d8139thjta80

Adjustments after merge

Show diffs side-by-side

added added

removed removed

lib/GenTest/Server/MySQLd.pm

use DBI;

use GenTest;

use GenTest::Constants;

use if windows(), Win32::Process;

use if osWindows(), Win32::Process;

use Time::HiRes;

use strict;

'valgrind' => MYSQLD_VALGRIND,

'valgrind_options' => MYSQLD_VALGRIND_OPTIONS},@_);

croak "No valgrind support on windows" if windows() and $self->[MYSQLD_VALGRIND];

croak "No valgrind support on windows" if osWindows() and $self->[MYSQLD_VALGRIND];

if (not defined $self->[MYSQLD_VARDIR]) {

$self->[MYSQLD_VARDIR] = "mysql-test/var";

}

if (windows()) {

if (osWindows()) {

## Use unix-style path's since that's what Perl expects...

$self->[MYSQLD_BASEDIR] =~ s/\\/\//g;

$self->[MYSQLD_VARDIR] =~ s/\\/\//g;

$self->[MYSQLD_DATADIR] = $self->[MYSQLD_VARDIR]."/data";

$self->[MYSQLD_MYSQLD] = $self->_find([$self->basedir],

windows()?["sql/Debug","sql/RelWithDebugInfo","sql/Release"]:["sql","libexec","bin","sbin"],

windows()?"mysqld.exe":"mysqld");

osWindows()?["sql/Debug","sql/RelWithDebugInfo","sql/Release"]:["sql","libexec","bin","sbin"],

osWindows()?"mysqld.exe":"mysqld");

$self->[MYSQLD_BOOT_SQL] = [];

121

122

$self->[MYSQLD_LIBMYSQL] =

123

$self->_findDir([$self->basedir],

124

windows()?["libmysql/Debug","libmysql/RelWithDebugInfo","libmysql/Release"]:["libmysql","libmysql/.libs","lib/mysql"],

125

windows()?"libmysql.dll":"libmysqlclient.so");

124

osWindows()?["libmysql/Debug","libmysql/RelWithDebugInfo","libmysql/Release"]:["libmysql","libmysql/.libs","lib/mysql"],

125

osWindows()?"libmysql.dll":"libmysqlclient.so");

126

127

$self->[MYSQLD_STDOPTS] = ["--basedir=".$self->basedir,

128

"--datadir=".$self->datadir,

196

foreach my $opt (@opts) {

197

$command .= ' '.join(' ',map{'"'.$_.'"'} @$opt);

198

}

199

$command =~ s/\//\\/g if windows();

199

$command =~ s/\//\\/g if osWindows();

200

return $command;

201

}

202

205

206

## 1. Clean old db if any

207

if (-d $self->vardir) {

208

if (windows()) {

208

if (osWindows()) {

209

my $vardir = $self->vardir;

210

$vardir =~ s/\//\\/g;

211

system('rmdir /s /q "'.$vardir.'"');

236

close BOOT;

237

238

## 4. Boot database

239

if (windows()) {

239

if (osWindows()) {

240

my $command = $self->generateCommand(["--no-defaults","--bootstrap"],

241

$self->[MYSQLD_STDOPTS]);

242

280

281

my $serverlog = $self->vardir."/".MYSQLD_LOG_FILE;

282

283

if (windows) {

283

if (osWindows) {

284

my $proc;

285

my $exe = $self->[MYSQLD_MYSQLD];

286

my $vardir = $self->[MYSQLD_VARDIR];

340

sub kill {

341

my ($self) = @_;

342

343

if (windows()) {

343

if (osWindows()) {

344

if (defined $self->[MYSQLD_WINDOWS_PROCESS]) {

345

$self->[MYSQLD_WINDOWS_PROCESS]->Kill(0);

346

say("Killed process ".$self->[MYSQLD_WINDOWS_PROCESS]->GetProcessId());

356

sub crash {

357

my ($self) = @_;

358

359

if (windows()) {

359

if (osWindows()) {

360

## How do i do this?????

361

$self->kill; ## Temporary

362

} else {

453

sub _absPath {

454

my ($self, $path) = @_;

455

456

if (windows()) {

456

if (osWindows()) {

457

return

458

$path =~ m/^[A-Z]:[\/\\]/i;

459

} else {

465

my($self) = @_;

466

467

if (not defined $self->[MYSQLD_VERSION]) {

468

if (windows) {

468

if (osWindows) {

469

$self->[MYSQLD_VERSION] = "5.5.5"; ## FIXME

470

} else {

471

my $conf = $self->_find([$self->basedir],

Older »