2004-10-23 11:32:52 +04:00
|
|
|
# Copyright (C) 2004 MySQL AB
|
|
|
|
|
#
|
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
|
# the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
# (at your option) any later version.
|
|
|
|
|
#
|
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
|
#
|
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
|
# along with this program; if not, write to the Free Software
|
|
|
|
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
|
|
2005-05-18 16:05:58 +04:00
|
|
|
INCLUDES= @ZLIB_INCLUDES@ -I$(top_srcdir)/include \
|
Re-apply missing changeset, orignally pushed by elliot
Add define YASSL_PREFIX when compiling yassl
Import patch from yaSSL
- avoid allocating memory for each call to 'EVP_md5' and
'EVP_des_ede3_cbc' which were not released until server was stopped
- Those functions are used from the SQL function 'des_encrypt' and
'des_decrypt'.
Add new define YASSL_PREFIX beforee including ssl.h to activate inclusion of prefix_*.h files
Bug#20022 mysql-test-run can't be run with secure connections turned on for all testcases
- Part 1, fixes rpl- and federated-tests where connection is made to 127.0.0.1
- Include prefix files that renames all public functions in yaSSLs
OpenSSL API to ya<function_name>. They will otherwise conflict
with OpenSSL functions if loaded by an application that uses OpenSSL
as well as libmysqlclient with yaSSL support.
Bug#18235: assertion/crash when windows mysqld is ended with ctrl-c
Two threads both try a shutdown sequence which creates a race to the
de-init/free of certain resources.
This exists in similar form in the client as 17926: "mysql.exe crashes
when ctrl-c is pressed in windows."
Update after merge to 5.0
BUG#18669: Session COM_STATISTICS breaks mysqladmin status.
Changed COM_STATISTICS to display the global status, instead of thead status, for slow queries and table opens.
- In function 'handle_grant_struct' when searching the memory structures for an
entry to modify, convert all entries here host.hostname is NULL to "" and compare that
with the host passed in argument "user_from".
- A user created with hostname "" is stored in "mysql.user" table as host="" but when loaded into
memory it'll be stored as host.hostname NULL. Specifiying "" as hostname means
that "any host" can connect. Thus is's correct to turn on allow_all_hosts
when such a user is found.
- Review and fix other places where host.hostname may be NULL.
BUG#19394 OPT_INNODB_THREAD_CONCURRENCY duplicated
Removed duplication (not a user-visible change)
client/Makefile.am:
Remove $yassl_includes
client/mysqltest.c:
Turn on ssl_verify_server_cert only if host is "localhost"
extra/yassl/include/openssl/crypto.h:
Add prefix file for ssl.h
extra/yassl/include/openssl/ssl.h:
Add include file "prefix_crypto.h" to rename SSL_* functions to yaSSL_*
extra/yassl/include/yassl_int.hpp:
Import patch yassl.diff
extra/yassl/src/Makefile.am:
Add defined YASSL_PREFIX when building yassl/testsuite
extra/yassl/src/ssl.cpp:
Import patch yassl.diff
extra/yassl/src/template_instnt.cpp:
Import patch yassl.diff
extra/yassl/src/yassl_int.cpp:
Import patch yassl.diff
extra/yassl/testsuite/Makefile.am:
Add defined YASSL_PREFIX when building yassl/testsuite
extra/yassl/yassl.vcproj:
Add define YASSL_PREFIX when compiling yassl
include/violite.h:
Add new define YASSL_PREFIX beforee including ssl.h to activate inclusion of prefix_*.h files
libmysql/Makefile.am:
Remove yassl_includes
libmysql_r/Makefile.am:
Remove yassl_includes
libmysqld/Makefile.am:
Remove yassl_includes
libmysqld/examples/Makefile.am:
Remove yassl_includes
mysql-test/r/analyze.result:
Add missing drop table
mysql-test/r/grant.result:
Reorder test result
Add test cases for users with hostname ""
mysql-test/r/ps.result:
Add missing drop table
mysql-test/t/analyze.test:
Add missing drop table
mysql-test/t/grant.test:
Add "use test"
Add test cases for users with hostname ""
- Test create, grant and drop as well as connecting as the user with hostname "".
mysql-test/t/ps.test:
Add missing drop table
server-tools/instance-manager/Makefile.am:
Remove yassl_includes
sql/Makefile.am:
Remove yassl_includes
sql/mysqld.cc:
We have three potential ways of hitting the iceberg:
- unireg_end() has basic de-init
- unireg_abort() has extended de-init
- main() has a de-init sequence similar to unireg_abort()
In the Windows version of the server, Control-C is handled
in a different thread from the one main() is in. The main
loop is told to end, then unireg_abort() is called. Its
de-init and that of main() will then race each other for
mutex- and cond-var-destroys, free(), and finally exit().
This patch introduces a special case for Windows that will eliminate
the race by ending the signal-handler via unireg_end() instead if
SIGINT is signalled. This seems the least intrusive fix that still
fixes user-visible behaviour.
Two of the startup options for mysqld, innodb_commit_concurrency
and innodb_thread_concurrency, were using the same enumeration
value. Changed to give innodb_commit_concurrency it's own value.
sql/sql_acl.cc:
Add check if host is NULL
Add check if grant_name->host.hostname is null
Convert places where host.hostname is NULL to "" before using it.
sql/sql_parse.cc:
Calculate and display the global statistics.
vio/Makefile.am:
Remove yassl_includes
extra/yassl/include/openssl/generate_prefix_files.pl:
New BitKeeper file ``extra/yassl/include/openssl/generate_prefix_files.pl''
extra/yassl/include/openssl/prefix_crypto.h:
New BitKeeper file ``extra/yassl/include/openssl/prefix_crypto.h''
extra/yassl/include/openssl/prefix_ssl.h:
New BitKeeper file ``extra/yassl/include/openssl/prefix_ssl.h''
2006-06-06 14:21:07 +03:00
|
|
|
@openssl_includes@ -I$(top_builddir)/include
|
2003-08-16 21:44:24 +04:00
|
|
|
|
2004-11-06 02:14:56 +03:00
|
|
|
DEFS= -DMYSQL_INSTANCE_MANAGER -DMYSQL_SERVER
|
2004-10-23 11:32:52 +04:00
|
|
|
|
2003-08-16 21:44:24 +04:00
|
|
|
# As all autoconf variables depend from ${prefix} and being resolved only when
|
2004-10-23 11:32:52 +04:00
|
|
|
# make is run, we can not put these defines to a header file (e.g. to
|
2003-08-16 21:44:24 +04:00
|
|
|
# default_options.h, generated from default_options.h.in)
|
|
|
|
|
# See automake/autoconf docs for details
|
|
|
|
|
|
2006-03-03 02:46:47 +01:00
|
|
|
noinst_LTLIBRARIES= liboptions.la
|
|
|
|
|
noinst_LIBRARIES= libnet.a
|
2004-10-23 11:32:52 +04:00
|
|
|
|
2006-03-03 02:46:47 +01:00
|
|
|
liboptions_la_CXXFLAGS= $(CXXFLAGS) \
|
2003-08-16 21:44:24 +04:00
|
|
|
-DDEFAULT_PID_FILE_NAME="$(localstatedir)/mysqlmanager.pid" \
|
|
|
|
|
-DDEFAULT_LOG_FILE_NAME="$(localstatedir)/mysqlmanager.log" \
|
2005-04-04 03:49:10 +04:00
|
|
|
-DDEFAULT_SOCKET_FILE_NAME="/tmp/mysqlmanager.sock" \
|
2006-02-10 02:15:55 +03:00
|
|
|
-DDEFAULT_PASSWORD_FILE_NAME="/etc/mysqlmanager.passwd" \
|
2005-02-05 10:15:34 +03:00
|
|
|
-DDEFAULT_MYSQLD_PATH="$(libexecdir)/mysqld$(EXEEXT)" \
|
2006-02-10 02:15:55 +03:00
|
|
|
-DDEFAULT_CONFIG_FILE="/etc/my.cnf" \
|
2004-10-23 11:32:52 +04:00
|
|
|
-DPROTOCOL_VERSION=@PROTOCOL_VERSION@
|
|
|
|
|
|
2006-03-03 02:46:47 +01:00
|
|
|
liboptions_la_SOURCES= options.h options.cc priv.h priv.cc
|
|
|
|
|
liboptions_la_LIBADD= $(top_builddir)/libmysql/get_password.lo
|
2004-10-23 11:32:52 +04:00
|
|
|
|
|
|
|
|
# MySQL sometimes uses symlinks to reuse code
|
|
|
|
|
# All symlinked files are grouped in libnet.a
|
|
|
|
|
|
2004-11-15 14:53:30 +03:00
|
|
|
nodist_libnet_a_SOURCES= net_serv.cc client_settings.h
|
2004-11-06 02:14:56 +03:00
|
|
|
libnet_a_LIBADD= $(top_builddir)/sql/password.$(OBJEXT) \
|
|
|
|
|
$(top_builddir)/sql/pack.$(OBJEXT) \
|
2004-11-15 14:53:30 +03:00
|
|
|
$(top_builddir)/sql/sql_state.$(OBJEXT) \
|
|
|
|
|
$(top_builddir)/sql/mini_client_errors.$(OBJEXT)\
|
|
|
|
|
$(top_builddir)/sql/client.$(OBJEXT)
|
2004-10-23 11:32:52 +04:00
|
|
|
|
2004-11-15 14:53:30 +03:00
|
|
|
CLEANFILES= net_serv.cc client_settings.h
|
2004-10-23 11:32:52 +04:00
|
|
|
|
2005-03-02 23:16:32 +03:00
|
|
|
net_serv.cc:
|
2005-11-09 11:56:04 +02:00
|
|
|
rm -f net_serv.cc
|
|
|
|
|
@LN_CP_F@ $(top_srcdir)/sql/net_serv.cc net_serv.cc
|
2004-10-23 11:32:52 +04:00
|
|
|
|
2005-03-02 23:16:32 +03:00
|
|
|
client_settings.h:
|
2005-11-09 11:56:04 +02:00
|
|
|
rm -f client_settings.h
|
|
|
|
|
@LN_CP_F@ $(top_srcdir)/sql/client_settings.h client_settings.h
|
2004-11-04 02:42:22 +03:00
|
|
|
|
2005-02-03 20:48:58 +03:00
|
|
|
libexec_PROGRAMS= mysqlmanager
|
2003-08-16 21:44:24 +04:00
|
|
|
|
2004-11-04 02:42:22 +03:00
|
|
|
mysqlmanager_SOURCES= command.cc command.h mysqlmanager.cc \
|
|
|
|
|
manager.h manager.cc log.h log.cc \
|
2004-10-23 11:32:52 +04:00
|
|
|
thread_registry.h thread_registry.cc \
|
2004-11-04 02:42:22 +03:00
|
|
|
listener.h listener.cc protocol.h protocol.cc \
|
2004-10-23 11:32:52 +04:00
|
|
|
mysql_connection.h mysql_connection.cc \
|
|
|
|
|
user_map.h user_map.cc \
|
|
|
|
|
messages.h messages.cc \
|
|
|
|
|
commands.h commands.cc \
|
|
|
|
|
instance.h instance.cc \
|
|
|
|
|
instance_map.h instance_map.cc\
|
|
|
|
|
instance_options.h instance_options.cc \
|
|
|
|
|
buffer.h buffer.cc parse.cc parse.h \
|
2004-11-06 02:14:56 +03:00
|
|
|
guardian.cc guardian.h \
|
2005-01-25 13:54:56 +03:00
|
|
|
parse_output.cc parse_output.h \
|
2005-08-05 20:44:52 +02:00
|
|
|
mysql_manager_error.h \
|
2006-05-18 18:57:50 +04:00
|
|
|
portability.h \
|
|
|
|
|
exit_codes.h \
|
|
|
|
|
user_management_commands.h \
|
|
|
|
|
user_management_commands.cc
|
2003-08-16 21:44:24 +04:00
|
|
|
|
2006-02-09 03:11:45 +01:00
|
|
|
mysqlmanager_LDADD= @CLIENT_EXTRA_LDFLAGS@ \
|
2006-03-06 17:17:22 +01:00
|
|
|
liboptions.la \
|
2004-10-23 11:32:52 +04:00
|
|
|
libnet.a \
|
|
|
|
|
$(top_builddir)/vio/libvio.a \
|
2004-11-06 02:14:56 +03:00
|
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
|
|
|
$(top_builddir)/strings/libmystrings.a \
|
|
|
|
|
$(top_builddir)/dbug/libdbug.a \
|
2005-10-18 15:43:59 +02:00
|
|
|
@openssl_libs@ @yassl_libs@ @ZLIB_LIBS@
|
2003-08-19 19:55:20 +04:00
|
|
|
|
2006-03-24 22:50:56 +01:00
|
|
|
EXTRA_DIST = WindowsService.cpp WindowsService.h IMService.cpp \
|
2006-05-12 10:51:07 +02:00
|
|
|
IMService.h CMakeLists.txt
|
2003-08-16 21:44:24 +04:00
|
|
|
|
2004-10-23 11:32:52 +04:00
|
|
|
tags:
|
2003-08-16 21:44:24 +04:00
|
|
|
ctags -R *.h *.cc
|
|
|
|
|
|
|
|
|
|
# Don't update the files from bitkeeper
|
|
|
|
|
%::SCCS/s.%
|