mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
7800d93bc3
One can set @@global.max_user_connections to -1 to block anyone, except SUPER user, to login. If max_user_connection is 0, one can't change it without a restart (needed to get user connections counting to work correctly) mysql-test/r/system_mysql_db.result: Changed max_user_connections to handle negative numbers. mysql-test/r/user_limits-2.result: New test case that one can't change max_user_connection if it was 0 mysql-test/r/user_limits.result: Fixed wrong error messages. mysql-test/r/variables.result: Store / restore max_user_connections (needed as there is now a --master.opt file that changes it) mysql-test/t/subselect_mat_cost-master.opt: Enable slow query log (as this test found some errors in slow query logging) mysql-test/t/user_limits-2.test: New test case that one can't change max_user_connection if it was 0 mysql-test/t/user_limits-master.opt: Set max_user_connections (as one can't change it if it was 0) mysql-test/t/user_limits.test: Test max_user_connections -1 mysql-test/t/variables-master.opt: Set max_user_connections (as one can't change it if it was 0) mysql-test/t/variables.test: Set/restore max_user_connections scripts/Makefile.am: Add a text message to mysql_fix_privilege_tables.sql that it's automaticly generated scripts/mysql_system_tables.sql: Change max_user_connections to signed scripts/mysql_system_tables_fix.sql: Change max_user_connections to signed sql/item_func.cc: Change SHOW_INT to be signed. (Needed for max_user_connections and it's probably a bug that it was not originally signed) sql/log.cc: Remove some code that was not needed (All these variables are reset at start of query) sql/mysql_priv.h: Made max_user_connections signed. Added max_user_connections_checking sql/mysqld.cc: Added max_user_connections_checking so that we know if max_user_connections was 0 at startup (Which means that we will not do connection counting for accounts that don't have user resource limits) Set thd->start_utime at same time as thr_create_utime. (Before start_utime could be < thr_create_utime which lead to wrong query counting) sql/set_var.cc: Don't allow one to change 'max_user_connections' if it was 0 at startup. sql/sql_acl.cc: Change user_connection counting to be negative. sql/sql_connect.cc: If max_user_connections is < 0 then only SUPER user can login. Fixed wrong variable names for error messages. Fixed wrong initial value for questions. Set thd->start_utime and thd->thr_create_utime at startup. Needed to get time_out_user_resource_limits() to work. sql/sql_show.cc: SHOW_INT is now negative sql/sql_yacc.yy: Support negative values for MAX_USER_CONNECTIONS sql/structs.h: Make user connect counting work with signed numbers.
204 lines
6.6 KiB
Makefile
204 lines
6.6 KiB
Makefile
# Copyright (C) 2000-2006 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; version 2 of the License.
|
|
#
|
|
# 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
|
|
|
|
## Process this file with automake to create Makefile.in
|
|
|
|
BUILT_SOURCES = mysql_fix_privilege_tables.sql \
|
|
mysql_fix_privilege_tables_sql.c
|
|
|
|
EXTRA_PROGRAMS = comp_sql
|
|
|
|
bin_SCRIPTS = @server_scripts@ \
|
|
msql2mysql \
|
|
mysql_config \
|
|
mysql_fix_privilege_tables \
|
|
mysql_fix_extensions \
|
|
mysql_setpermission \
|
|
mysql_secure_installation \
|
|
mysql_zap \
|
|
mysqlaccess \
|
|
mysqlbug \
|
|
mysql_convert_table_format \
|
|
mysql_find_rows \
|
|
mysqlhotcopy \
|
|
mytop \
|
|
mysqldumpslow \
|
|
mysqld_multi
|
|
|
|
noinst_SCRIPTS = make_binary_distribution \
|
|
make_sharedlib_distribution \
|
|
convert-debug-for-diff
|
|
|
|
EXTRA_SCRIPTS = make_binary_distribution.sh \
|
|
make_sharedlib_distribution.sh \
|
|
msql2mysql.sh \
|
|
mysql_config.sh \
|
|
mysql_config.pl.in \
|
|
mysql_fix_privilege_tables.sh \
|
|
mysql_fix_extensions.sh \
|
|
mysql_install_db.sh \
|
|
mysql_install_db.pl.in \
|
|
mysql_setpermission.sh \
|
|
mysql_secure_installation.sh \
|
|
mysql_secure_installation.pl.in \
|
|
mysql_zap.sh \
|
|
mysqlaccess.sh \
|
|
mysqlbug.sh \
|
|
mysql_convert_table_format.sh \
|
|
mysql_find_rows.sh \
|
|
mysqlhotcopy.sh \
|
|
mytop.sh \
|
|
mysqldumpslow.sh \
|
|
mysqld_multi.sh \
|
|
mysqld_safe.sh \
|
|
convert-debug-for-diff.sh
|
|
|
|
EXTRA_DIST = $(EXTRA_SCRIPTS) \
|
|
mysqlaccess.conf \
|
|
mysqlbug \
|
|
make_win_bin_dist \
|
|
mysql_fix_privilege_tables_sql.c \
|
|
mysql_system_tables_fix.sql \
|
|
CMakeLists.txt
|
|
|
|
dist_pkgdata_DATA = fill_help_tables.sql \
|
|
mysql_fix_privilege_tables.sql \
|
|
mysql_system_tables.sql \
|
|
mysql_system_tables_data.sql \
|
|
mysql_test_data_timezone.sql
|
|
|
|
CLEANFILES = @server_scripts@ \
|
|
make_binary_distribution \
|
|
make_sharedlib_distribution \
|
|
msql2mysql \
|
|
mysql_config \
|
|
mysql_fix_privilege_tables \
|
|
mysql_fix_extensions \
|
|
mysql_setpermission \
|
|
mysql_secure_installation \
|
|
mysql_zap \
|
|
mysqlaccess \
|
|
mysql_convert_table_format \
|
|
mysql_find_rows \
|
|
mysqlhotcopy \
|
|
mytop \
|
|
mysqldumpslow \
|
|
mysqld_multi \
|
|
convert-debug-for-diff \
|
|
$(EXTRA_PROGRAMS)
|
|
|
|
pkgplugindir = $(pkglibdir)/plugin
|
|
|
|
# Default same as 'pkgdatadir', but we can override it
|
|
pkgsuppdir = $(datadir)/@PACKAGE@
|
|
|
|
# mysqlbug should be distributed built so that people can report build
|
|
# failures with it.
|
|
DISTCLEANFILES = $(BUILT_SOURCES) mysqlbug
|
|
|
|
# We want the right version and configure comand line in mysqlbug
|
|
mysqlbug: ${top_builddir}/config.status mysqlbug.sh
|
|
|
|
# Build mysql_fix_privilege_tables.sql from the files that contain
|
|
# the system tables for this version of MySQL plus any commands
|
|
# needed to upgrade the system tables from an older version
|
|
mysql_fix_privilege_tables.sql: mysql_system_tables.sql \
|
|
mysql_system_tables_fix.sql
|
|
@echo "Building $@";
|
|
@echo "-- This file is automaticly generated from" > $@
|
|
@echo "-- mysql_system_tables.sql & mysql_system_tables_fix.sql" >> $@
|
|
@echo "" >> $@
|
|
@cat mysql_system_tables.sql mysql_system_tables_fix.sql >> $@
|
|
|
|
#
|
|
# Build mysql_fix_privilege_tables_sql.c from
|
|
# mysql_fix_privileges_tables.sql using comp_sql
|
|
# The "sleep" ensures the generated file has a younger timestamp than its source
|
|
# (which may have been generated in this very same "make" run).
|
|
#
|
|
mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql
|
|
$(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT)
|
|
sleep 2
|
|
$(top_builddir)/scripts/comp_sql$(EXEEXT) \
|
|
mysql_fix_privilege_tables \
|
|
$(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@
|
|
|
|
|
|
SUFFIXES = .sh
|
|
|
|
.sh:
|
|
@RM@ -f $@ $@-t
|
|
@SED@ \
|
|
-e 's!@''bindir''@!$(bindir)!g' \
|
|
-e 's!@''sbindir''@!$(sbindir)!g' \
|
|
-e 's!@''scriptdir''@!$(bindir)!g' \
|
|
-e 's!@''prefix''@!$(prefix)!g' \
|
|
-e 's!@''datadir''@!$(datadir)!g' \
|
|
-e 's!@''localstatedir''@!$(localstatedir)!g' \
|
|
-e 's!@''libexecdir''@!$(libexecdir)!g' \
|
|
-e 's!@''pkglibdir''@!$(pkglibdir)!g' \
|
|
-e 's!@''pkgincludedir''@!$(pkgincludedir)!g' \
|
|
-e 's!@''pkgdatadir''@!$(pkgdatadir)!g' \
|
|
-e 's!@''pkgplugindir''@!$(pkgplugindir)!g' \
|
|
-e 's!@''pkgsuppdir''@!$(pkgsuppdir)!g' \
|
|
-e 's!@''sysconfdir''@!$(sysconfdir)!g' \
|
|
-e 's!@''mandir''@!$(mandir)!g' \
|
|
-e 's!@''infodir''@!$(infodir)!g' \
|
|
-e 's!@''CC''@!@CC@!'\
|
|
-e 's!@''CXX''@!@CXX@!'\
|
|
-e 's!@''GXX''@!@GXX@!'\
|
|
-e 's!@''SAVE_CC''@!@SAVE_CC@!'\
|
|
-e 's!@''SAVE_CXX''@!@SAVE_CXX@!'\
|
|
-e 's!@''CC_VERSION''@!@CC_VERSION@!'\
|
|
-e 's!@''CXX_VERSION''@!@CXX_VERSION@!'\
|
|
-e 's!@''PERL''@!@PERL@!' \
|
|
-e 's!@''SAVE_ASFLAGS''@!@SAVE_ASFLAGS@!'\
|
|
-e 's!@''SAVE_CFLAGS''@!@SAVE_CFLAGS@!'\
|
|
-e 's!@''SAVE_CXXFLAGS''@!@SAVE_CXXFLAGS@!'\
|
|
-e 's!@''SAVE_LDFLAGS''@!@SAVE_LDFLAGS@!'\
|
|
-e 's!@''ASFLAGS''@!@ASFLAGS@!'\
|
|
-e 's!@''CFLAGS''@!@CFLAGS@!'\
|
|
-e 's!@''CXXFLAGS''@!@CXXFLAGS@!'\
|
|
-e 's!@''LDFLAGS''@!@LDFLAGS@!'\
|
|
-e 's!@''LIBDL''@!@LIBDL@!'\
|
|
-e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \
|
|
-e 's!@''ZLIB_LIBS''@!@ZLIB_LIBS@!' \
|
|
-e 's!@''LIBS''@!@LIBS@!' \
|
|
-e 's!@''WRAPLIBS''@!@WRAPLIBS@!' \
|
|
-e 's!@''innodb_system_libs''@!@innodb_system_libs@!' \
|
|
-e 's!@''openssl_libs''@!@openssl_libs@!' \
|
|
-e 's!@''VERSION''@!@VERSION@!' \
|
|
-e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \
|
|
-e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
|
|
-e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \
|
|
-e 's!@''MACHINE_TYPE''@!@MACHINE_TYPE@!' \
|
|
-e 's!@''HOSTNAME''@!@HOSTNAME@!' \
|
|
-e 's!@''SYSTEM_TYPE''@!@SYSTEM_TYPE@!' \
|
|
-e 's!@''CHECK_PID''@!@CHECK_PID@!' \
|
|
-e 's!@''FIND_PROC''@!@FIND_PROC@!' \
|
|
-e 's!@''MYSQLD_DEFAULT_SWITCHES''@!@MYSQLD_DEFAULT_SWITCHES@!' \
|
|
-e 's!@''MYSQL_UNIX_ADDR''@!@MYSQL_UNIX_ADDR@!' \
|
|
-e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \
|
|
-e 's!@''MYSQL_TCP_PORT_DEFAULT''@!@MYSQL_TCP_PORT_DEFAULT@!' \
|
|
-e 's!@''TARGET_LINUX''@!@TARGET_LINUX@!' \
|
|
-e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \
|
|
-e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
|
|
-e 's!@''STATIC_NSS_FLAGS''@!@STATIC_NSS_FLAGS@!' \
|
|
-e 's!@''NON_THREADED_LIBS''@!@NON_THREADED_LIBS@!' \
|
|
-e 's!@''ZLIB_DEPS''@!@ZLIB_DEPS@!' \
|
|
-e "s!@MAKE@!$(MAKE)!" \
|
|
$< > $@-t
|
|
@CHMOD@ +x $@-t
|
|
@MV@ $@-t $@
|