5 files changed, 12 insertions, 4 deletions
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php
index c69574c565..8de647e4db 100644
--- a/phpBB/install/convertors/functions_phpbb20.php
+++ b/phpBB/install/convertors/functions_phpbb20.php
@@ -1710,7 +1710,7 @@ function phpbb_check_username_collisions()
 		break;
 	
 		case 'mysql4':
-			if (version_compare($db->mysql_version, '4.1.3', '>='))
+			if (version_compare($db->sql_server_info(true), '4.1.3', '>='))
 			{
 				$map_dbms = 'mysql_41';
 			}
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 53d22462c0..c9ced1dbcb 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -552,7 +552,7 @@ switch ($db->sql_layer)
 	break;
 
 	case 'mysql4':
-		if (version_compare($db->mysql_version, '4.1.3', '>='))
+		if (version_compare($db->sql_server_info(true), '4.1.3', '>='))
 		{
 			$map_dbms = 'mysql_41';
 		}
@@ -1837,6 +1837,9 @@ function change_database_data(&$no_updates, $version)
 			set_config('enable_queue_trigger', '0');
 			set_config('queue_trigger_posts', '3');
 
+			// Not prefilling yet
+			set_config('dbms_version', '');
+
 			// Resync post counts
 			$sql = 'SELECT COUNT(p.post_id) AS num_posts, u.user_id
 				FROM ' . USERS_TABLE . ' u
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php
index 25d8551df4..7a4155e09d 100644
--- a/phpBB/install/install_convert.php
+++ b/phpBB/install/install_convert.php
@@ -685,7 +685,7 @@ class install_convert extends module
 			// Thanks MySQL, for silently converting...
 			case 'mysql':
 			case 'mysql4':
-				if (version_compare($src_db->mysql_version, '4.1.3', '>='))
+				if (version_compare($src_db->sql_server_info(true), '4.1.3', '>='))
 				{
 					$convert->mysql_convert = true;
 				}
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index cfa74fba03..991d1d02a6 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1157,7 +1157,7 @@ class install_install extends module
 		// If mysql is chosen, we need to adjust the schema filename slightly to reflect the correct version. ;)
 		if ($data['dbms'] == 'mysql')
 		{
-			if (version_compare($db->mysql_version, '4.1.3', '>='))
+			if (version_compare($db->sql_server_info(true), '4.1.3', '>='))
 			{
 				$available_dbms[$data['dbms']]['SCHEMA'] .= '_41';
 			}
@@ -1363,6 +1363,10 @@ class install_install extends module
 
 			'UPDATE ' . $data['table_prefix'] . "forums
 				SET forum_last_post_time = $current_time",
+
+			'UPDATE ' . $data['table_prefix'] . "config
+				SET config_value = '" . $db->sql_escape($db->sql_server_info(true)) . "'
+				WHERE config_name = 'dbms_version'",
 		);
 
 		if (@extension_loaded('gd') || can_load_dll('gd'))
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 422a5b0bda..a4dcb508eb 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -75,6 +75,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_enable', '0'
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_fax', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_mail', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('database_gc', '604800');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('dbms_version', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat', 'D M d, Y g:i a');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('display_last_edited', '1');