database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Bug#19362 im_daemon_lifecycle fails when built from source distribution

Browse Source 
- Add function "mysqld_real_path" which is needed if the mysqld_path is a symlink or a script(like libtool) that executes the real mysqld.
- Add new variable mysqld_real_path
- Use mysqld_real_path from fill_instance_version
This commit is contained in:
msvensson@neptunus.(none)
2006-04-26 12:45:22 +02:00
parent 2c3a3bd87f
commit a0a8a711d6
2 changed files with 61 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server-tools/instance-manager/instance_options.h
View File

@ -44,7 +44,8 @@ public:
Instance_options() :
mysqld_version(0), mysqld_socket(0), mysqld_datadir(0),
mysqld_bind_address(0), mysqld_pid_file(0), mysqld_port(0),
mysqld_port_val(0), mysqld_path(0), nonguarded(0), shutdown_delay(0),
mysqld_port_val(0), mysqld_path(0), mysqld_real_path(0),
nonguarded(0), shutdown_delay(0),
shutdown_delay_val(0), filled_default_options(0)
{}
~Instance_options();
@ -84,6 +85,7 @@ public:
uint instance_name_len;
const char *mysqld_path;
uint mysqld_path_len;
const char *mysqld_real_path;
const char *nonguarded;
const char *shutdown_delay;
uint shutdown_delay_val;
@ -95,6 +97,7 @@ public:
private:
int fill_log_options();
int fill_instance_version();
int fill_mysqld_real_path();
int add_to_argv(const char *option);
int get_default_option(char *result, size_t result_len,
const char *option_name);