← Back to branch summary

~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-03-01 13:41:39 UTC
  • mto: (0.101.19 lp-randgen-xml)
  • mto: This revision was merged to the branch mainline in revision 2435.
  • Revision ID: bernt.johnsen@sun.com-20100301134139-5dy4eqjqdr7pojx8
More Cmake out-of-source stuff

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/GenTest/Server/MySQLd.pm
89
89
    ## Check for CMakestuff to get hold of source dir:
90
90
 
91
91
    my $source;
92
 
    if (-d $self->basedir."/CMakeCache.txt") {
 
92
    if (-e $self->basedir."/CMakeCache.txt") {
93
93
        open CACHE, $self->basedir."/CMakeCache.txt";
94
94
        while (<CACHE>){
95
95
            if (m/^MySQL_SOURCE_DIR:STATIC=(.*)$/) {
96
96
                $source = $1;
97
 
                say("Found source $source");
 
97
                say("Found source directory at $source");
98
98
                last;
99
99
            }
100
100
        }
109
109
                          ["scripts","share/mysql"], $file));
110
110
    }
111
111
    
112
 
    $self->[MYSQLD_MESSAGES] = $self->_findDir([$self->basedir], ["sql/share","share/mysql"], "errmsg-utf8.txt");
 
112
    $self->[MYSQLD_MESSAGES] = 
 
113
       $self->_findDir(defined $source?[$self->basedir,$source]:[$self->basedir], 
 
114
                       ["sql/share","share/mysql"], "english/errmsg.sys");
113
115
    
114
 
    $self->[MYSQLD_LIBMYSQL] = $self->_findDir([$self->basedir], 
115
 
                                               windows()?["libmysql/Debug","libmysql/RelWithDebugInfo"]:["libmysql","libmysql/.libs","lib/mysql"], 
116
 
                                               windows()?"libmysql.dll":"libmysqlclient.so");
 
116
    $self->[MYSQLD_LIBMYSQL] = 
 
117
       $self->_findDir([$self->basedir], 
 
118
                       windows()?["libmysql/Debug","libmysql/RelWithDebugInfo"]:["libmysql","libmysql/.libs","lib/mysql"], 
 
119
                       windows()?"libmysql.dll":"libmysqlclient.so");
117
120
    
118
121
    $self->[MYSQLD_STDOPTS] = ["--basedir=".$self->basedir,
119
122
                               "--datadir=".$self->datadir,