Show databases even with skip_show_database in MySQL 5 (thanks to Rad…

…oslaw Kowalewski)
vrana · Mar 10, 2011 · f332258 · f332258
1 parent 8bf0263
commit f332258
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
@@ -261,6 +261,7 @@ function connect() {
 	* @return array
 	*/
 	function get_databases($flush = true) {
+		global $connection;
 		// SHOW DATABASES can take a very long time so it is cached
 		$return = &get_session("dbs");
 		if (!isset($return)) {
@@ -269,7 +270,7 @@ function get_databases($flush = true) {
 				ob_flush();
 				flush();
 			}
-			$return = get_vals("SHOW DATABASES");
+			$return = get_vals($connection->server_info >= 5 ? "SELECT SCHEMA_NAME FROM information_schema.SCHEMATA" : "SHOW DATABASES"); // SHOW DATABASES can be disabled by skip_show_database
 		}
 		return $return;
 	}

diff --git a/changes.txt b/changes.txt
@@ -6,6 +6,7 @@ Enum editor and textarea Ctrl+Enter working in IE
 AJAX forms in Google Chrome
 Parse UTF-16 and UTF-8 BOM in all text uploads
 Use DELIMITER in history
+Show databases even with skip_show_database in MySQL 5 (thanks to Radoslaw Kowalewski)
 Polish translation
 
 Adminer 3.2.0 (released 2011-02-24):