database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166

Browse Source 
into  pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166


mysql-test/t/variables.test:
  Auto merged
mysql-test/r/variables.result:
  Manual merge
sql/log.cc:
  Manual merge, spaces added to 5.1 version
sql/mysqld.cc:
  Code no longer exists
sql/set_var.cc:
  Manual merge
This commit is contained in:
unknown
2007-02-20 16:26:30 +01:00
parent 13f628fabc 629b9cf87f
commit 1125ce9a1b
5 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/mysqld.cc
View File

@@ -2677,9 +2677,15 @@ static int init_common_variables(const char *conf_file_name, int argc,
*/
mysql_bin_log.init_pthread_objects();
if (gethostname(glob_hostname,sizeof(glob_hostname)-4) < 0)
strmov(glob_hostname,"mysql");
strmake(pidfile_name, glob_hostname, sizeof(pidfile_name)-5);
if (gethostname(glob_hostname,sizeof(glob_hostname)) < 0)
{
strmake(glob_hostname, STRING_WITH_LEN("localhost"));
sql_print_warning("gethostname failed, using '%s' as hostname",
glob_hostname);
strmake(pidfile_name, STRING_WITH_LEN("mysql"));
}
else
strmake(pidfile_name, glob_hostname, sizeof(pidfile_name)-5);
strmov(fn_ext(pidfile_name),".pid"); // Add proper extension
/*