From c3d1a8b14a7b05c8afca8413fada57e59106277a Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Wed, 13 Jul 2011 16:59:22 +0200 Subject: [PATCH] Ignore SkipLockedTables (Drizzle) --- libraries/common.inc.php | 8 ++++---- libraries/config.default.php | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 06f6417f99..2bc8928a96 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -929,11 +929,11 @@ if (! defined('PMA_MINIMUM_COMMON')) { PMA_fatalError(__('You should upgrade to %s %s or later.'), array('MySQL', '5.0.15')); } - /** - * DisableIS must be set to false for Drizzle, it maps SHOW commands to IS queries anyway - */ - if (PMA_DRIZZLE && $cfg['Server']['DisableIS']) { + if (PMA_DRIZZLE) { + // DisableIS must be set to false for Drizzle, it maps SHOW commands to IS queries anyway $cfg['Server']['DisableIS'] = false; + // SHOW OPEN TABLES is not supported by Drizzle + $cfg['SkipLockedTables'] = false; } /** diff --git a/libraries/config.default.php b/libraries/config.default.php index 6d54aa6693..e28d6a8a79 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -596,6 +596,7 @@ $cfg['MemoryLimit'] = '0'; /** * mark used tables, make possible to show locked tables (since MySQL 3.23.30) + * Is ignored for Drizzle. * * @global boolean $cfg['SkipLockedTables'] */