diff options
author | unknown <tim@cane.mysql.fi> | 2001-01-19 02:46:47 +0200 |
---|---|---|
committer | unknown <tim@cane.mysql.fi> | 2001-01-19 02:46:47 +0200 |
commit | 5e5cd0f87e3940367faf54d2bdd9ddffe8bdecde (patch) | |
tree | 666b05b61969934012175867905f95344c37afcb /sql | |
parent | b85d67d9ecce0e8b8b26cfca7006522a66c784ff (diff) | |
parent | c25f29bcdfa381e7116e1e671877a6051c3a898a (diff) | |
download | mariadb-git-5e5cd0f87e3940367faf54d2bdd9ddffe8bdecde.tar.gz |
Merge work.mysql.com:/home/bk/mysql
into cane.mysql.fi:/usr/home/tim/my/work
Diffstat (limited to 'sql')
-rw-r--r-- | sql/mysqld.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index b6caa6c492c..d2d18f09696 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1471,6 +1471,7 @@ int main(int argc, char **argv) strmov(glob_hostname,"mysql"); strmov(pidfile_name,glob_hostname); strmov(strcend(pidfile_name,'.'),".pid"); // Add extension + strcat(server_version, MYSQL_SERVER_SUFFIX); #ifdef DEMO_VERSION strcat(server_version,"-demo"); #endif |