summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-07-03 20:00:14 +0200
committerSergei Golubchik <sergii@pisem.net>2011-07-03 20:00:14 +0200
commitb843de11d5f7732abc4f7fdc565b64e1cd781bbb (patch)
tree3c2c5e60ba7cf260c3763785348b0e10af981d64 /storage
parentb4a0b2c2f862ab0de853dc34e1e56f6159043e45 (diff)
downloadmariadb-git-b843de11d5f7732abc4f7fdc565b64e1cd781bbb.tar.gz
Bug#25679
Ensure that we do not hold the LOCK_open mutex while attempting to establish FederatedX connection to guard against a trivial Denial of Service scenario.
Diffstat (limited to 'storage')
-rw-r--r--storage/federatedx/ha_federatedx.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc
index ab14ddb5544..f0e2289fb4c 100644
--- a/storage/federatedx/ha_federatedx.cc
+++ b/storage/federatedx/ha_federatedx.cc
@@ -3368,15 +3368,13 @@ int ha_federatedx::create(const char *name, TABLE *table_arg,
{
FEDERATEDX_SERVER server;
-#ifdef NOT_YET
/*
Bug#25679
Ensure that we do not hold the LOCK_open mutex while attempting
to establish FederatedX connection to guard against a trivial
Denial of Service scenerio.
*/
- safe_mutex_assert_not_owner(&LOCK_open);
-#endif
+ mysql_mutex_assert_not_owner(&LOCK_open);
fill_server(thd->mem_root, &server, &tmp_share, create_info->table_charset);