diff options
| author | unknown <dlenev@mysql.com> | 2004-12-29 22:35:16 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2004-12-29 22:35:16 +0300 |
| commit | f174d5a2414e22b6cf452a2e8cbb6b72395a56dc (patch) | |
| tree | 1a687bd272d791651de5a4a1716efef6eebbe4b6 /sql/mysqld.cc | |
| parent | 44728324f0abe3e327fc2095a99e647b1c44dd8d (diff) | |
| parent | 05b709fc77e2f321fa3fa45ee5b2ec2ceae54055 (diff) | |
| download | mariadb-git-f174d5a2414e22b6cf452a2e8cbb6b72395a56dc.tar.gz | |
Manual merge of patch implementing WL#1339 with main tree.
client/mysqltest.c:
Auto merged
mysql-test/r/system_mysql_db.result:
Auto merged
sql/lex.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/structs.h:
Auto merged
mysql-test/r/grant.result:
Manual merge
scripts/mysql_create_system_tables.sh:
Manual merge
scripts/mysql_fix_privilege_tables.sql:
Manual merge
sql/mysql_priv.h:
Manual merge
sql/mysqld.cc:
Manual merge
sql/sql_parse.cc:
Manual merge
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index b99ca3721a7..9ee4437540d 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -298,6 +298,12 @@ my_bool lower_case_file_system= 0; my_bool opt_innodb_safe_binlog= 0; my_bool opt_large_pages= 0; uint opt_large_page_size= 0; +my_bool opt_old_style_user_limits= 0; +/* + True if there is at least one per-hour limit for some user, so we should check + them before each query (and possibly reset counters when hour is changed). + False otherwise. +*/ volatile bool mqh_used = 0; my_bool sp_automatic_privileges= 1; @@ -4204,7 +4210,8 @@ enum options_mysqld OPT_UPDATABLE_VIEWS_WITH_LIMIT, OPT_SP_AUTOMATIC_PRIVILEGES, OPT_AUTO_INCREMENT, OPT_AUTO_INCREMENT_OFFSET, - OPT_ENABLE_LARGE_PAGES + OPT_ENABLE_LARGE_PAGES, + OPT_OLD_STYLE_USER_LIMITS }; @@ -4622,6 +4629,10 @@ Disable with --skip-ndbcluster (will save memory).", "Only use one thread (for debugging under Linux).", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, #endif + {"old-style-user-limits", OPT_OLD_STYLE_USER_LIMITS, + "Enable old-style user limits (before 5.0.3 user resources were counted per each user+host vs. per account)", + (gptr*) &opt_old_style_user_limits, (gptr*) &opt_old_style_user_limits, + 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"pid-file", OPT_PID_FILE, "Pid file used by safe_mysqld.", (gptr*) &pidfile_name_ptr, (gptr*) &pidfile_name_ptr, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, |