diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-23 17:01:02 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-23 17:01:02 +0200 |
| commit | 0d5a18b53bd30af029b27e39579b52f05b8f7115 (patch) | |
| tree | 8cc026fffb64b3233d53f89373b5f930e8ed9a49 /sql/mysqld.cc | |
| parent | 2c4ad7372c0737d49812f1e22a108dc841b4ba74 (diff) | |
| parent | e4a8fd700ef4078cdd7ea11cd57e7d2bc9c11253 (diff) | |
| download | mariadb-git-0d5a18b53bd30af029b27e39579b52f05b8f7115.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
client/Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
configure.in:
Auto merged
client/mysqltest.c:
Auto merged
libmysqld/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -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 b7ea52fbef6..6f7b8d53e05 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3177,6 +3177,7 @@ static void init_ssl() DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd)); if (!ssl_acceptor_fd) { + sql_print_warning("Failed to setup SSL"); opt_use_ssl = 0; have_ssl= SHOW_OPTION_DISABLED; } |