diff options
| author | Dmitry Shulga <Dmitry.Shulga@oracle.com> | 2011-03-15 18:57:36 +0600 |
|---|---|---|
| committer | Dmitry Shulga <Dmitry.Shulga@oracle.com> | 2011-03-15 18:57:36 +0600 |
| commit | 10f5982ee546f41df56dbf2f2933e29cc493db2b (patch) | |
| tree | 0f5b82b368f0393b2467be245564bcd49d0933f9 /sql/mysqld.h | |
| parent | 14df359b396b5eb3253826b4e81af7c41125e039 (diff) | |
| parent | 6c2f5e306ca3fa621cd25cedd49181d6e0d5cbc6 (diff) | |
| download | mariadb-git-10f5982ee546f41df56dbf2f2933e29cc493db2b.tar.gz | |
Manual merge from mysql-5.1 for Bug#11764168 (56976: Severe denial
of service in prepared statements).
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 7fa09ba77ac..13ca52596ce 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -126,6 +126,7 @@ extern char *default_storage_engine; extern bool opt_endinfo, using_udf_functions; extern my_bool locked_in_memory; extern bool opt_using_transactions; +extern ulong max_long_data_size; extern ulong current_pid; extern ulong expire_logs_days; extern my_bool relay_log_recovery; @@ -397,7 +398,8 @@ enum options_mysqld OPT_UPDATE_LOG, OPT_WANT_CORE, OPT_ENGINE_CONDITION_PUSHDOWN, - OPT_LOG_ERROR + OPT_LOG_ERROR, + OPT_MAX_LONG_DATA_SIZE }; |