diff options
| author | unknown <hf@deer.mysql.r18.ru> | 2003-01-20 18:47:25 +0400 |
|---|---|---|
| committer | unknown <hf@deer.mysql.r18.ru> | 2003-01-20 18:47:25 +0400 |
| commit | f9dff9748e65288aa1c420f52452e61a5aef0594 (patch) | |
| tree | 63d38e511b0b14f39e8fefc5eab11abc8e583d5d /sql/log.cc | |
| parent | 150a238f033c3e3f8d67dfaa7d1616237738c1cb (diff) | |
| download | mariadb-git-f9dff9748e65288aa1c420f52452e61a5aef0594.tar.gz | |
SCRUM
embedded-related changes
include/mysql_com.h:
net_flush emptification
libmysqld/lib_sql.cc:
Some Protocol:: methods implemented
sql/convert.cc:
changes to use convert in embedded library
sql/field.cc:
set_key_image changed
sql/item.cc:
obsolete functions removed
sql/item.h:
embedded-related changes in Protocol class
sql/log.cc:
there's no ports in embedded library
sql/mysqld.cc:
some debug stuff
sql/protocol.cc:
embedded-related changes
sql/protocol.h:
embedded-related changes
sql/sql_cache.cc:
comment added
sql/sql_class.cc:
no need to do special embedded select_send::send_row
sql/sql_class.h:
embedded-related changes
sql/sql_parse.cc:
comments added debugging stuff deleted
sql/sql_show.cc:
non-protocol sending removed
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc index de64ad844f0..f14bbae2543 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -23,7 +23,6 @@ #endif #include "mysql_priv.h" -#include <mysql.h> #include "sql_acl.h" #include "sql_repl.h" @@ -203,7 +202,9 @@ bool MYSQL_LOG::open(const char *log_name, enum_log_type log_type_arg, case LOG_NORMAL: { char *end; -#ifdef __NT__ +#ifdef EMBEDDED_LIBRARY + sprintf(buff, "%s, Version: %s, embedded library\n", my_progname, server_version); +#elif __NT__ sprintf(buff, "%s, Version: %s, started with:\nTCP Port: %d, Named Pipe: %s\n", my_progname, server_version, mysql_port, mysql_unix_port); #else sprintf(buff, "%s, Version: %s, started with:\nTcp port: %d Unix socket: %s\n", my_progname,server_version,mysql_port,mysql_unix_port); |