diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-09-29 14:12:57 -0600 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-09-29 14:12:57 -0600 |
| commit | ea1afa371c3c89e8ab84dbfe75f6fd301db50ca0 (patch) | |
| tree | d1a5d9a41ef41c058a1950de0d7d2365ed9c81f2 /sql/log.cc | |
| parent | 9163d93fb5ae4ab5dd6f635064831b8e0a0de72a (diff) | |
| parent | c7f7ff9e6286889eef655119980e5c5c7fef8791 (diff) | |
| download | mariadb-git-ea1afa371c3c89e8ab84dbfe75f6fd301db50ca0.tar.gz | |
Merge siva.hindu.god:/usr/home/tim/m/bk/wl3516/50
into siva.hindu.god:/usr/home/tim/m/bk/wl3516/51
client/mysql.cc:
Manual merge
sql/log.cc:
Manual merge
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sql/log.cc b/sql/log.cc index 9875b16f8e5..afe0fafa712 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1579,17 +1579,18 @@ bool MYSQL_LOG::open(const char *log_name, enum_log_type log_type_arg, if (log_type == LOG_NORMAL) { char *end; - int len=my_snprintf(buff, sizeof(buff), "%s, Version: %s. " + int len=my_snprintf(buff, sizeof(buff), "%s, Version: %s (%s). " #ifdef EMBEDDED_LIBRARY - "embedded library\n", my_progname, server_version + "embedded library\n", + my_progname, server_version, MYSQL_COMPILATION_COMMENT #elif __NT__ "started with:\nTCP Port: %d, Named Pipe: %s\n", - my_progname, server_version, mysqld_port, - mysqld_unix_port + my_progname, server_version, MYSQL_COMPILATION_COMMENT, + mysqld_port, mysqld_unix_port #else "started with:\nTcp port: %d Unix socket: %s\n", - my_progname, server_version, mysqld_port, - mysqld_unix_port + my_progname, server_version, MYSQL_COMPILATION_COMMENT, + mysqld_port, mysqld_unix_port #endif ); end= strnmov(buff + len, "Time Id Command Argument\n", |