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/sys_vars.cc | |
| 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/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 612ce48de0b..8f9b91f0f92 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -1182,6 +1182,16 @@ static Sys_var_harows Sys_sql_max_join_size( NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_max_join_size), DEPRECATED(70000, 0)); +static Sys_var_ulong Sys_max_long_data_size( + "max_long_data_size", + "The maximum BLOB length to send to server from " + "mysql_send_long_data API. Deprecated option; " + "use max_allowed_packet instead.", + READ_ONLY GLOBAL_VAR(max_long_data_size), + CMD_LINE(REQUIRED_ARG, OPT_MAX_LONG_DATA_SIZE), + VALID_RANGE(1024, UINT_MAX32), DEFAULT(1024*1024), + BLOCK_SIZE(1)); + static PolyLock_mutex PLock_prepared_stmt_count(&LOCK_prepared_stmt_count); static Sys_var_ulong Sys_max_prepared_stmt_count( "max_prepared_stmt_count", |