Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2020-11-20 17:53:46 +01:00
commit 6866d59a0c
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -2843,8 +2843,8 @@ function get_database_size()
{ {
case 'mysqli': case 'mysqli':
$mysql_engine = ['MyISAM', 'InnoDB', 'Aria']; $mysql_engine = ['MyISAM', 'InnoDB', 'Aria'];
$db_name = $db->get_db_name(); $db_name = $db->get_db_name();
$database_size = 0;
$sql = 'SHOW TABLE STATUS $sql = 'SHOW TABLE STATUS
FROM ' . $db_name; FROM ' . $db_name;
@ -2860,6 +2860,8 @@ function get_database_size()
$db->sql_freeresult($result); $db->sql_freeresult($result);
$database_size = $database_size ? $database_size : false;
break; break;
case 'sqlite3': case 'sqlite3':