diff options
| author | monty@mashka.mysql.fi <> | 2002-12-11 12:59:55 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-12-11 12:59:55 +0200 |
| commit | 53ac261312965b2baf35a8ef66ccdad35af43ea8 (patch) | |
| tree | 0a4f351d282a58c5c13fde6ecc0a5a9e829e4445 /sql | |
| parent | b737eb89a7bfb1bc7ad45ef384433874af4e2942 (diff) | |
| download | mariadb-git-53ac261312965b2baf35a8ef66ccdad35af43ea8.tar.gz | |
Added back -max to server name if we are using InnoDB.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 0895013c37e..17cf8f79646 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -184,17 +184,17 @@ static char **opt_argv; #ifdef __WIN__ #undef MYSQL_SERVER_SUFFIX #ifdef __NT__ -#if defined(HAVE_BERKELEY_DB) +#if defined(HAVE_INNOBASE_DB) || defined(HAVE_BERKELEY_DB) #define MYSQL_SERVER_SUFFIX "-max-nt" #else #define MYSQL_SERVER_SUFFIX "-nt" #endif /* ...DB */ -#elif defined(HAVE_BERKELEY_DB) +#elif defined(HAVE_INNOBASE_DB) || defined(HAVE_BERKELEY_DB) #define MYSQL_SERVER_SUFFIX "-max" #else #define MYSQL_SERVER_SUFFIX "" #endif /* __NT__ */ -#endif +#endif /* __WIN__ */ #ifdef HAVE_BERKELEY_DB SHOW_COMP_OPTION have_berkeley_db=SHOW_OPTION_YES; |