diff options
| author | monty@mysql.com <> | 2004-05-25 02:28:44 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-05-25 02:28:44 +0300 |
| commit | 0babddff40fe58ba01e2568bf1aa401e9c94fc4e (patch) | |
| tree | 8f4959df163bedbdeab86cd9d49c14f128305c89 /sql | |
| parent | 912bf99387214d770503e3adc9f13813773bc83d (diff) | |
| download | mariadb-git-0babddff40fe58ba01e2568bf1aa401e9c94fc4e.tar.gz | |
New MYSQL_SERVER_SUFFIX usage (for easier compilation)
Update of VC++ project files.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 4 | ||||
| -rw-r--r-- | sql/mysqld_suffix.h | 23 | ||||
| -rw-r--r-- | sql/set_var.cc | 2 |
3 files changed, 9 insertions, 20 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 35a665cb54a..6b4e0aba455 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4937,12 +4937,12 @@ static void get_options(int argc,char **argv) static void set_server_version(void) { char *end= strxmov(server_version, MYSQL_SERVER_VERSION, - MYSQL_SERVER_SUFFIX, NullS); + MYSQL_SERVER_SUFFIX_STR, NullS); #ifdef EMBEDDED_LIBRARY end= strmov(end, "-embedded"); #endif #ifndef DBUG_OFF - if (!strstr(MYSQL_SERVER_SUFFIX, "-debug")) + if (!strstr(MYSQL_SERVER_SUFFIX_STR, "-debug")) end= strmov(end, "-debug"); #endif if (opt_log || opt_update_log || opt_slow_log || opt_bin_log) diff --git a/sql/mysqld_suffix.h b/sql/mysqld_suffix.h index 502cdeed75f..405c5d855b7 100644 --- a/sql/mysqld_suffix.h +++ b/sql/mysqld_suffix.h @@ -15,24 +15,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* - Set MYSQL_SERVER_SUFFIX - The following code is quite ugly as there is no portable way to set a + Set MYSQL_SERVER_SUFFIX_STR + The following code is quite ugly as there is no portable way to easily set a string to the value of a macro */ -#if defined(MYSQL_SERVER_SUFFIX_NT) -#undef MYSQL_SERVER_SUFFIX -#define MYSQL_SERVER_SUFFIX "-nt" -#elif defined(MYSQL_SERVER_SUFFIX_MAX) -#undef MYSQL_SERVER_SUFFIX -#define MYSQL_SERVER_SUFFIX "-max" -#elif defined(MYSQL_SERVER_SUFFIX_NT_MAX) -#undef MYSQL_SERVER_SUFFIX -#define MYSQL_SERVER_SUFFIX "-nt-max" -#elif defined(MYSQL_SERVER_SUFFIX_PRO) -#undef MYSQL_SERVER_SUFFIX -#define MYSQL_SERVER_SUFFIX "-pro" -#elif defined(MYSQL_SERVER_SUFFIX_PRO_NT) -#undef MYSQL_SERVER_SUFFIX -#define MYSQL_SERVER_SUFFIX "-pro-nt" +#ifdef MYSQL_SERVER_SUFFIX +#define MYSQL_SERVER_SUFFIX_STR STRINGIFY_ARG(MYSQL_SERVER_SUFFIX) +#else +#define MYSQL_SERVER_SUFFIX_STR MYSQL_SERVER_SUFFIX_DEF #endif diff --git a/sql/set_var.cc b/sql/set_var.cc index fb3645183ca..525da26a5ac 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -340,7 +340,7 @@ static sys_var_thd_ulong sys_default_week_format("default_week_format", sys_var_const_str sys_os("version_compile_os", SYSTEM_TYPE); /* Global read-only variable describing server license */ -sys_var_const_str sys_license("license", LICENSE); +sys_var_const_str sys_license("license", STRINGIFY_ARG(LICENSE)); /* |