← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

Added --character-set-dir

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/DBServer/MySQL/MySQLd.pm
38
38
use constant MYSQLD_BOOT_SQL => 6;
39
39
use constant MYSQLD_STDOPTS => 7;
40
40
use constant MYSQLD_MESSAGES => 8;
41
 
use constant MYSQLD_SERVER_OPTIONS => 9;
42
 
use constant MYSQLD_AUXPID => 10;
43
 
use constant MYSQLD_SERVERPID => 11;
44
 
use constant MYSQLD_WINDOWS_PROCESS => 12;
45
 
use constant MYSQLD_DBH => 13;
46
 
use constant MYSQLD_START_DIRTY => 14;
47
 
use constant MYSQLD_VALGRIND => 15;
48
 
use constant MYSQLD_VALGRIND_OPTIONS => 16;
49
 
use constant MYSQLD_VERSION => 17;
 
41
use constant MYSQLD_CHARSETS => 9;
 
42
use constant MYSQLD_SERVER_OPTIONS => 10;
 
43
use constant MYSQLD_AUXPID => 11;
 
44
use constant MYSQLD_SERVERPID => 12;
 
45
use constant MYSQLD_WINDOWS_PROCESS => 13;
 
46
use constant MYSQLD_DBH => 14;
 
47
use constant MYSQLD_START_DIRTY => 15;
 
48
use constant MYSQLD_VALGRIND => 16;
 
49
use constant MYSQLD_VALGRIND_OPTIONS => 17;
 
50
use constant MYSQLD_VERSION => 18;
50
51
 
51
52
use constant MYSQLD_PID_FILE => "mysql.pid";
52
53
use constant MYSQLD_LOG_FILE => "mysql.err";
117
118
    $self->[MYSQLD_MESSAGES] = 
118
119
       $self->_findDir(defined $source?[$self->basedir,$source]:[$self->basedir], 
119
120
                       ["sql/share","share/mysql"], "english/errmsg.sys");
 
121
 
 
122
    $self->[MYSQLD_CHARSETS] =
 
123
        $self->_findDir(defined $source?[$self->basedir,$source]:[$self->basedir], 
 
124
                        ["sql/share/charsets","share/mysql/charsets"], "Index.xml");
 
125
                         
120
126
    
121
127
    $self->[MYSQLD_LIBMYSQL] = 
122
128
       $self->_findDir([$self->basedir], 
125
131
    
126
132
    $self->[MYSQLD_STDOPTS] = ["--basedir=".$self->basedir,
127
133
                               "--datadir=".$self->datadir,
128
 
                               $self->_messages,
 
134
                               $self->_messages,
 
135
                               "--character-sets-dir=".$self->[MYSQLD_CHARSETS],
129
136
                               "--default-storage-engine=myisam",
130
137
                               "--log-warnings=0"];    
131
138