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

Don't change server suffix if given to configure

Browse Source 
Portability fixes


client/mysqltest.c:
  Fixed output of 'affected rows'
innobase/os/os0file.c:
  Portability fix (for AIX)
mysql-test/r/rpl_trunc_binlog.result:
  Update results after merge
sql/mysqld.cc:
  Don't change server suffix if given to configure
This commit is contained in:
unknown
2004-03-18 01:48:46 +02:00
parent 24148f04c7
commit f107cb7098
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/mysqld.cc
View File

@ -2104,10 +2104,11 @@ static int init_common_variables(const char *conf_file_name, int argc,
strmov(fn_ext(pidfile_name),".pid"); // Add proper extension
#ifndef DBUG_OFF
strxmov(strend(server_version),MYSQL_SERVER_SUFFIX,"-debug",NullS);
#else
strmov(strend(server_version),MYSQL_SERVER_SUFFIX);
if (*(MYSQL_SERVER_SUFFIX))
strxmov(strend(server_version),MYSQL_SERVER_SUFFIX,"-debug",NullS);
else
#endif
strmov(strend(server_version),MYSQL_SERVER_SUFFIX);
load_defaults(conf_file_name, groups, &argc, &argv);
defaults_argv=argv;