diff options
| author | Ignacio Galarza <iggy@mysql.com> | 2009-07-31 15:22:02 -0400 |
|---|---|---|
| committer | Ignacio Galarza <iggy@mysql.com> | 2009-07-31 15:22:02 -0400 |
| commit | 09877515f22be7b4cbd0a96be4814f6024ad6ce3 (patch) | |
| tree | 1ec946eb73a7116ce88cd568b44517de785490e0 /sql/mysqld.cc | |
| parent | 7fc27f3dd5e4c1b30dcf6d725b8f2b037cfbbb2b (diff) | |
| download | mariadb-git-09877515f22be7b4cbd0a96be4814f6024ad6ce3.tar.gz | |
Bug#17270 - mysql client tool could not find ../share/charsets folder and fails.
- Define and pass compile time path variables as pre-processor definitions to
mimic the makefile build.
- Set new CMake version and policy requirements explicitly.
- Changed DATADIR to MYSQL_DATADIR to avoid conflicting definition in
Platform SDK header ObjIdl.h which also defines DATADIR.
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index ec08edbc265..37b3754d716 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6865,7 +6865,7 @@ static void mysql_init_variables(void) /* Set directory paths */ strmake(language, LANGUAGE, sizeof(language)-1); - strmake(mysql_real_data_home, get_relative_path(DATADIR), + strmake(mysql_real_data_home, get_relative_path(MYSQL_DATADIR), sizeof(mysql_real_data_home)-1); mysql_data_home_buff[0]=FN_CURLIB; // all paths are relative from here mysql_data_home_buff[1]=0; |