MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2966 from annando/1611-myisam

Browse source 
Bugfix: We should only search in the current database for MyISAM tables
This commit is contained in:
Tobias Diekershoff 2016-11-22 17:53:01 +01:00 committed by GitHub
commit 22732fef12
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/dba.php
View file

@ -109,6 +109,17 @@ class dba {
return $return; return $return;
} }
/**
* @brief Returns the selected database name
*
* @return string
*/
public function database_name() {
$r = $this->q("SELECT DATABASE() AS `db`");
return $r[0]['db'];
}
/** /**
* @brief Returns the number of rows * @brief Returns the number of rows
* *

3
mod/admin.php
View file

@ -430,7 +430,8 @@ function admin_page_queue(&$a) {
function admin_page_summary(&$a) { function admin_page_summary(&$a) {
global $db; global $db;
// are there MyISAM tables in the DB? If so, trigger a warning message // are there MyISAM tables in the DB? If so, trigger a warning message
$r = q("SELECT `engine` FROM `information_schema`.`tables` WHERE `engine`='myisam' LIMIT 1"); $r = q("SELECT `engine` FROM `information_schema`.`tables` WHERE `engine` = 'myisam' AND `table_schema` = '%s' LIMIT 1",
dbesc($db->database_name()));
$showwarning = false; $showwarning = false;
$warningtext = array(); $warningtext = array();
if (dbm::is_result($r)) { if (dbm::is_result($r)) {