database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order

Browse Source 
to be able to build MSI based installer
This commit is contained in:
Vladislav Vaintroub
2011-01-29 18:51:12 +01:00
parent 3edf4dcd5a
commit b19e99865c
46 changed files with 1908 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/lib/My/ConfigFactory.pm
View File

@ -37,6 +37,15 @@ sub get_testdir {
return $testdir;
}
# Retrive build directory (which is different from basedir in out-of-source build)
sub get_bindir {
if (defined $ENV{MTR_BINDIR})
{
return $ENV{MTR_BINDIR};
}
my ($self, $group)= @_;
return $self->get_basedir($group);
}
sub fix_charset_dir {
my ($self, $config, $group_name, $group)= @_;
@ -46,7 +55,7 @@ sub fix_charset_dir {
sub fix_language {
my ($self, $config, $group_name, $group)= @_;
return my_find_dir($self->get_basedir($group),
return my_find_dir($self->get_bindir($group),
\@share_locations, "english");
}
@ -339,6 +348,7 @@ my @mysql_upgrade_rules=
sub post_check_client_group {
my ($self, $config, $client_group_name, $mysqld_group_name)= @_;
# Settings needed for client, copied from its "mysqld"
my %client_needs=
(
@ -348,7 +358,6 @@ sub post_check_client_group {
user => '#user',
password => '#password',
);
my $group_to_copy_from= $config->group($mysqld_group_name);
while (my ($name_to, $name_from)= each( %client_needs )) {
my $option= $group_to_copy_from->option($name_from);