Fix problem where PBMS daemon is not loaded or the 'pbms' database doesn't exist.
This commit is contained in:

committed by
Marc Delisle

parent
f8653e5803
commit
a8e5b0f275
@@ -109,10 +109,11 @@ function checkBLOBStreamingPlugins()
|
||||
$PMA_Config->set('PHP_PBMS_EXISTS', FALSE);
|
||||
$PMA_Config->set('FILEINFO_EXISTS', FALSE);
|
||||
|
||||
// Check to see if the BLOB Streaming PHP extension is loaded
|
||||
if (extension_loaded("PBMS")) {
|
||||
$PMA_Config->set('PHP_PBMS_EXISTS', TRUE);
|
||||
}
|
||||
// Create the 'pbms' database if it doesn't exist.
|
||||
// PBMS creates this database automaticly as soon as
|
||||
// a PBMS enabled table is accessed but we may need it earlier
|
||||
// when a select is done on pbms.pbms_enabled.
|
||||
PMA_DBI_query("create database IF NOT EXISTS pbms;" );
|
||||
|
||||
// check if PECL's fileinfo library exist
|
||||
$finfo = NULL;
|
||||
@@ -324,6 +325,9 @@ function PMA_BS_IsTablePBMSEnabled($db_name, $tbl_name, $tbl_type)
|
||||
// return if unable to load PMA configuration
|
||||
if (empty($PMA_Config))
|
||||
return FALSE;
|
||||
|
||||
if (!$PMA_Config->get('BLOBSTREAMING_PLUGINS_EXIST') )
|
||||
return FALSE;
|
||||
|
||||
// This information should be cached rather than selecting it each time.
|
||||
//$query = "SELECT count(*) FROM information_schema.TABLES T, pbms.pbms_enabled E where T.table_schema = ". PMA_backquote($db_name) . " and T.table_name = ". PMA_backquote($tbl_name) . " and T.engine = E.name";
|
||||
|
Reference in New Issue
Block a user