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 | feb6d223285e91d435f3c72f2dc3f2b5e73c0f4a (patch) | |
| tree | 0f5b82b368f0393b2467be245564bcd49d0933f9 /sql/mysqld.h | |
| parent | f94e7288e33332584074ee85f625db9a93f2369c (diff) | |
| parent | 9320dca994fdae18c549cb59266d49846dc1f839 (diff) | |
| download | mariadb-git-feb6d223285e91d435f3c72f2dc3f2b5e73c0f4a.tar.gz | |
Manual merge from mysql-5.1 for Bug#11764168 (56976: Severe denial
of service in prepared statements).
sql/sql_prepare.cc:
At mysql_stmt_get_longdata(): instead of pushing an internal
error handler (as done in 5.1-tree) we save, set and restore
the statement's diagnostics area and warning info.
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 }; |