WL#13229 Remove --old-style-user-limits

  Removed the option
  Removed the tests which uses the option.

Change-Id: I626c1f7d6d45dd13bd8695f34c3ee5932be1e911

Author: V S Murthy Sidagam

mysql-test/r/mysqld--help-notwin.result

@@ -747,11 +747,6 @@ The following options may be given as the first argument:
  --offline-mode      Make the server into offline mode
  --old               Use compatible behavior
  --old-alter-table   Use old, non-optimized alter table
- --old-style-user-limits 
- Enable old-style user limits (before 5.0.3, user
- resources were counted for each user + host vs. per
- account). This option is deprecated and will be removed
- in a future version.
  --open-files-limit=# 
  If this is not 0, then mysqld will use this value to
  reserve file descriptors to use with setrlimit(). If this
@@ -1821,7 +1816,6 @@ no-dd-upgrade FALSE
 offline-mode FALSE
 old FALSE
 old-alter-table FALSE
-old-style-user-limits FALSE
 optimizer-max-subgraph-pairs 100000
 optimizer-prune-level 1
 optimizer-search-depth 62

mysql-test/r/mysqld--help-win.result

@@ -750,11 +750,6 @@ The following options may be given as the first argument:
  --offline-mode      Make the server into offline mode
  --old               Use compatible behavior
  --old-alter-table   Use old, non-optimized alter table
- --old-style-user-limits 
- Enable old-style user limits (before 5.0.3, user
- resources were counted for each user + host vs. per
- account). This option is deprecated and will be removed
- in a future version.
  --open-files-limit=# 
  If this is not 0, then mysqld will use this value to
  reserve file descriptors to use with setrlimit(). If this
@@ -1833,7 +1828,6 @@ no-monitor FALSE
 offline-mode FALSE
 old FALSE
 old-alter-table FALSE
-old-style-user-limits FALSE
 optimizer-max-subgraph-pairs 100000
 optimizer-prune-level 1
 optimizer-search-depth 62

mysql-test/r/mysqld_deprecated_options.result

@@ -4489,13 +4489,9 @@ int acl_authenticate(THD *thd, enum_server_command command) {
            acl_user->user_resource.conn_per_hour ||
            acl_user->user_resource.user_conn ||
            global_system_variables.max_user_connections) &&
-          get_or_create_user_conn(
-              thd,
-              (opt_old_style_user_limits ? sctx->user().str
-                                         : sctx->priv_user().str),
-              (opt_old_style_user_limits ? sctx->host_or_ip().str
-                                         : sctx->priv_host().str),
-              &acl_user->user_resource))
+          get_or_create_user_conn(thd, sctx->priv_user().str,
+                                  sctx->priv_host().str,
+                                  &acl_user->user_resource))
         goto end;  // The error is set by get_or_create_user_conn()
 
       /*

mysql-test/t/mysqld_deprecated_options-master.opt

@@ -1294,7 +1294,7 @@ mysql_mutex_t LOCK_partial_revokes;
 #if defined(ENABLED_DEBUG_SYNC)
 MYSQL_PLUGIN_IMPORT uint opt_debug_sync_timeout = 0;
 #endif /* defined(ENABLED_DEBUG_SYNC) */
-bool opt_old_style_user_limits = false, trust_function_creators = false;
+bool trust_function_creators = false;
 bool check_proxy_users = false, mysql_native_password_proxy_users = false,
      sha256_password_proxy_users = false;
 /*
@@ -10861,12 +10861,6 @@ struct my_option my_long_options[] = {
     {"memlock", 0, "Lock mysqld in memory.", &locked_in_memory,
      &locked_in_memory, nullptr, GET_BOOL, NO_ARG, 0, 0, 0, nullptr, 0,
      nullptr},
-    {"old-style-user-limits", OPT_OLD_STYLE_USER_LIMITS,
-     "Enable old-style user limits (before 5.0.3, user resources were counted "
-     "for each user + host vs. per account). "
-     "This option is deprecated and will be removed in a future version.",
-     &opt_old_style_user_limits, &opt_old_style_user_limits, nullptr, GET_BOOL,
-     NO_ARG, 0, 0, 0, nullptr, 0, nullptr},
     {"port-open-timeout", 0,
      "Maximum time in seconds to wait for the port to become free. "
      "(Default: No wait).",
@@ -12669,9 +12663,6 @@ bool mysqld_get_one_option(int optid,
                              "'--replica-parallel-workers=1'");
       }
       break;
-    case OPT_OLD_STYLE_USER_LIMITS:
-      push_deprecated_warn_no_replacement(nullptr, "--old-style-user-limits");
-      break;
     case OPT_SYNC_RELAY_LOG_INFO:
       LogErr(WARNING_LEVEL, ER_DEPRECATE_MSG_NO_REPLACEMENT,
              "--sync-relay-log-info");

mysql-test/t/mysqld_deprecated_options.test

@@ -220,7 +220,7 @@ extern bool opt_allow_suspicious_udfs;
 extern const char *opt_secure_file_priv;
 extern bool opt_log_slow_admin_statements, opt_log_slow_replica_statements;
 extern bool sp_automatic_privileges, opt_noacl;
-extern bool opt_old_style_user_limits, trust_function_creators;
+extern bool trust_function_creators;
 extern bool check_proxy_users, mysql_native_password_proxy_users,
     sha256_password_proxy_users;
 #ifdef _WIN32

sql/auth/sql_authentication.cc

@@ -119,7 +119,6 @@ enum options_mysqld {
   OPT_REPLICA_PARALLEL_TYPE,
   OPT_SSL_SESSION_CACHE_TIMEOUT,
   OPT_REPLICA_PARALLEL_WORKERS,
-  OPT_OLD_STYLE_USER_LIMITS,
   OPT_SYNC_RELAY_LOG_INFO,
   OPT_BINLOG_TRANSACTION_DEPENDENCY_TRACKING,
   OPT_CHARACTER_SET_CLIENT_HANDSHAKE,

sql/mysqld.cc

@@ -70,8 +70,7 @@ typedef struct user_conn {
   /*
      Pointer to user+host key (pair separated by '\0') defining the entity
      for which resources are counted (By default it is user account thus
-     priv_user/priv_host pair is used. If --old-style-user-limits option
-     is enabled, resources are counted for each user+host separately).
+     priv_user/priv_host pair is used).
   */
   char *user;
   /* Pointer to host part of the key. */