10 files changed, 18 insertions, 742 deletions
diff --git a/phpBB/phpbb/config_php_file.php b/phpBB/phpbb/config_php_file.php
index 7445e7df22..e3f7357720 100644
--- a/phpBB/phpbb/config_php_file.php
+++ b/phpBB/phpbb/config_php_file.php
@@ -155,6 +155,12 @@ class config_php_file
 			return $dbms;
 		}
 
+		// Force use of mysqli when specifying mysql
+		if (preg_match('/(phpbb\\\db\\\driver\\\)?mysql$/i', $dbms))
+		{
+			return 'phpbb\db\driver\mysqli';
+		}
+
 		throw new \RuntimeException("You have specified an invalid dbms driver: $dbms");
 	}
 }
diff --git a/phpBB/phpbb/db/driver/mysql.php b/phpBB/phpbb/db/driver/mysql.php
deleted file mode 100644
index 8ce70444c2..0000000000
--- a/phpBB/phpbb/db/driver/mysql.php
+++ /dev/null
@@ -1,502 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-namespace phpbb\db\driver;
-
-/**
-* MySQL4 Database Abstraction Layer
-* Compatible with:
-* MySQL 3.23+
-* MySQL 4.0+
-* MySQL 4.1+
-* MySQL 5.0+
-*/
-class mysql extends \phpbb\db\driver\mysql_base
-{
-	var $multi_insert = true;
-	var $connect_error = '';
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
-	{
-		$this->persistency = $persistency;
-		$this->user = $sqluser;
-		$this->server = $sqlserver . (($port) ? ':' . $port : '');
-		$this->dbname = $database;
-
-		$this->sql_layer = 'mysql4';
-
-		if ($this->persistency)
-		{
-			if (!function_exists('mysql_pconnect'))
-			{
-				$this->connect_error = 'mysql_pconnect function does not exist, is mysql extension installed?';
-				return $this->sql_error('');
-			}
-			$this->db_connect_id = @mysql_pconnect($this->server, $this->user, $sqlpassword);
-		}
-		else
-		{
-			if (!function_exists('mysql_connect'))
-			{
-				$this->connect_error = 'mysql_connect function does not exist, is mysql extension installed?';
-				return $this->sql_error('');
-			}
-			$this->db_connect_id = @mysql_connect($this->server, $this->user, $sqlpassword, $new_link);
-		}
-
-		if ($this->db_connect_id && $this->dbname != '')
-		{
-			if (@mysql_select_db($this->dbname, $this->db_connect_id))
-			{
-				// Determine what version we are using and if it natively supports UNICODE
-				if (version_compare($this->sql_server_info(true), '4.1.0', '>='))
-				{
-					@mysql_query("SET NAMES 'utf8'", $this->db_connect_id);
-
-					// enforce strict mode on databases that support it
-					if (version_compare($this->sql_server_info(true), '5.0.2', '>='))
-					{
-						$result = @mysql_query('SELECT @@session.sql_mode AS sql_mode', $this->db_connect_id);
-						if ($result)
-						{
-							$row = mysql_fetch_assoc($result);
-							mysql_free_result($result);
-							$modes = array_map('trim', explode(',', $row['sql_mode']));
-						}
-						else
-						{
-							$modes = array();
-						}
-
-						// TRADITIONAL includes STRICT_ALL_TABLES and STRICT_TRANS_TABLES
-						if (!in_array('TRADITIONAL', $modes))
-						{
-							if (!in_array('STRICT_ALL_TABLES', $modes))
-							{
-								$modes[] = 'STRICT_ALL_TABLES';
-							}
-
-							if (!in_array('STRICT_TRANS_TABLES', $modes))
-							{
-								$modes[] = 'STRICT_TRANS_TABLES';
-							}
-						}
-
-						$mode = implode(',', $modes);
-						@mysql_query("SET SESSION sql_mode='{$mode}'", $this->db_connect_id);
-					}
-				}
-				else if (version_compare($this->sql_server_info(true), '4.0.0', '<'))
-				{
-					$this->sql_layer = 'mysql';
-				}
-
-				return $this->db_connect_id;
-			}
-		}
-
-		return $this->sql_error('');
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_server_info($raw = false, $use_cache = true)
-	{
-		global $cache;
-
-		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('mysql_version')) === false)
-		{
-			$result = @mysql_query('SELECT VERSION() AS version', $this->db_connect_id);
-			if ($result)
-			{
-				$row = mysql_fetch_assoc($result);
-				mysql_free_result($result);
-
-				$this->sql_server_version = $row['version'];
-
-				if (!empty($cache) && $use_cache)
-				{
-					$cache->put('mysql_version', $this->sql_server_version);
-				}
-			}
-		}
-
-		return ($raw) ? $this->sql_server_version : 'MySQL ' . $this->sql_server_version;
-	}
-
-	/**
-	* SQL Transaction
-	* @access private
-	*/
-	function _sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return @mysql_query('BEGIN', $this->db_connect_id);
-			break;
-
-			case 'commit':
-				return @mysql_query('COMMIT', $this->db_connect_id);
-			break;
-
-			case 'rollback':
-				return @mysql_query('ROLLBACK', $this->db_connect_id);
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_query($query = '', $cache_ttl = 0)
-	{
-		if ($query != '')
-		{
-			global $cache;
-
-			if ($this->debug_sql_explain)
-			{
-				$this->sql_report('start', $query);
-			}
-			else if ($this->debug_load_time)
-			{
-				$this->curtime = microtime(true);
-			}
-
-			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
-			$this->sql_add_num_queries($this->query_result);
-
-			if ($this->query_result === false)
-			{
-				if (($this->query_result = @mysql_query($query, $this->db_connect_id)) === false)
-				{
-					$this->sql_error($query);
-				}
-
-				if ($this->debug_sql_explain)
-				{
-					$this->sql_report('stop', $query);
-				}
-				else if ($this->debug_load_time)
-				{
-					$this->sql_time += microtime(true) - $this->curtime;
-				}
-
-				if (!$this->query_result)
-				{
-					return false;
-				}
-
-				if ($cache && $cache_ttl)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
-				}
-				else if (strpos($query, 'SELECT') === 0)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-				}
-			}
-			else if ($this->debug_sql_explain)
-			{
-				$this->sql_report('fromcache', $query);
-			}
-		}
-		else
-		{
-			return false;
-		}
-
-		return $this->query_result;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_affectedrows()
-	{
-		if ($this->db_connect_id)
-		{
-			// We always want the number of matched rows
-			// instead of changed rows, when running an update.
-			// So when mysql_info() returns the number of matched rows
-			// we return that one instead of mysql_affected_rows()
-			$mysql_info = @mysql_info($this->db_connect_id);
-			if ($mysql_info !== false)
-			{
-				$match = array();
-				preg_match('#^Rows matched: (\d)+  Changed: (\d)+  Warnings: (\d)+$#', $mysql_info, $match);
-				if (isset($match[1]))
-				{
-					return $match[1];
-				}
-			}
-
-			return @mysql_affected_rows($this->db_connect_id);
-		}
-		return false;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_fetchrow($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_fetchrow($query_id);
-		}
-
-		return ($query_id) ? mysql_fetch_assoc($query_id) : false;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_rowseek($rownum, &$query_id)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_rowseek($rownum, $query_id);
-		}
-
-		return ($query_id !== false) ? @mysql_data_seek($query_id, $rownum) : false;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_nextid()
-	{
-		return ($this->db_connect_id) ? @mysql_insert_id($this->db_connect_id) : false;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_freeresult($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_freeresult($query_id);
-		}
-
-		if (isset($this->open_queries[(int) $query_id]))
-		{
-			unset($this->open_queries[(int) $query_id]);
-			return mysql_free_result($query_id);
-		}
-
-		return false;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_escape($msg)
-	{
-		if (!$this->db_connect_id)
-		{
-			return @mysql_real_escape_string($msg);
-		}
-
-		return @mysql_real_escape_string($msg, $this->db_connect_id);
-	}
-
-	/**
-	* return sql error array
-	* @access private
-	*/
-	function _sql_error()
-	{
-		if ($this->db_connect_id)
-		{
-			$error = array(
-				'message'	=> @mysql_error($this->db_connect_id),
-				'code'		=> @mysql_errno($this->db_connect_id),
-			);
-		}
-		else if (function_exists('mysql_error'))
-		{
-			$error = array(
-				'message'	=> @mysql_error(),
-				'code'		=> @mysql_errno(),
-			);
-		}
-		else
-		{
-			$error = array(
-				'message'	=> $this->connect_error,
-				'code'		=> '',
-			);
-		}
-
-		return $error;
-	}
-
-	/**
-	* Close sql connection
-	* @access private
-	*/
-	function _sql_close()
-	{
-		return @mysql_close($this->db_connect_id);
-	}
-
-	/**
-	* Build db-specific report
-	* @access private
-	*/
-	function _sql_report($mode, $query = '')
-	{
-		static $test_prof;
-
-		// current detection method, might just switch to see the existence of INFORMATION_SCHEMA.PROFILING
-		if ($test_prof === null)
-		{
-			$test_prof = false;
-			if (version_compare($this->sql_server_info(true), '5.0.37', '>=') && version_compare($this->sql_server_info(true), '5.1', '<'))
-			{
-				$test_prof = true;
-			}
-		}
-
-		switch ($mode)
-		{
-			case 'start':
-
-				$explain_query = $query;
-				if (preg_match('/UPDATE ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
-				{
-					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
-				}
-				else if (preg_match('/DELETE FROM ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
-				{
-					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
-				}
-
-				if (preg_match('/^SELECT/', $explain_query))
-				{
-					$html_table = false;
-
-					// begin profiling
-					if ($test_prof)
-					{
-						@mysql_query('SET profiling = 1;', $this->db_connect_id);
-					}
-
-					if ($result = @mysql_query("EXPLAIN $explain_query", $this->db_connect_id))
-					{
-						while ($row = mysql_fetch_assoc($result))
-						{
-							$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-						}
-						mysql_free_result($result);
-					}
-
-					if ($html_table)
-					{
-						$this->html_hold .= '</table>';
-					}
-
-					if ($test_prof)
-					{
-						$html_table = false;
-
-						// get the last profile
-						if ($result = @mysql_query('SHOW PROFILE ALL;', $this->db_connect_id))
-						{
-							$this->html_hold .= '<br />';
-							while ($row = mysql_fetch_assoc($result))
-							{
-								// make <unknown> HTML safe
-								if (!empty($row['Source_function']))
-								{
-									$row['Source_function'] = str_replace(array('<', '>'), array('&lt;', '&gt;'), $row['Source_function']);
-								}
-
-								// remove unsupported features
-								foreach ($row as $key => $val)
-								{
-									if ($val === null)
-									{
-										unset($row[$key]);
-									}
-								}
-								$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-							}
-							mysql_free_result($result);
-						}
-
-						if ($html_table)
-						{
-							$this->html_hold .= '</table>';
-						}
-
-						@mysql_query('SET profiling = 0;', $this->db_connect_id);
-					}
-				}
-
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @mysql_query($query, $this->db_connect_id);
-				if ($result)
-				{
-					while ($void = mysql_fetch_assoc($result))
-					{
-						// Take the time spent on parsing rows into account
-					}
-					mysql_free_result($result);
-				}
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
diff --git a/phpBB/phpbb/db/extractor/mysql_extractor.php b/phpBB/phpbb/db/extractor/mysql_extractor.php
index 534e8b7653..f3cb0db457 100644
--- a/phpBB/phpbb/db/extractor/mysql_extractor.php
+++ b/phpBB/phpbb/db/extractor/mysql_extractor.php
@@ -79,14 +79,7 @@ class mysql_extractor extends base_extractor
 			throw new extractor_not_initialized_exception();
 		}
 
-		if ($this->db->get_sql_layer() === 'mysqli')
-		{
-			$this->write_data_mysqli($table_name);
-		}
-		else
-		{
-			$this->write_data_mysql($table_name);
-		}
+		$this->write_data_mysqli($table_name);
 	}
 
 	/**
@@ -180,101 +173,6 @@ class mysql_extractor extends base_extractor
 	}
 
 	/**
-	* Extracts data from database table (for MySQL driver)
-	*
-	* @param	string	$table_name	name of the database table
-	* @return null
-	* @throws \phpbb\db\extractor\exception\extractor_not_initialized_exception when calling this function before init_extractor()
-	*/
-	protected function write_data_mysql($table_name)
-	{
-		if (!$this->is_initialized)
-		{
-			throw new extractor_not_initialized_exception();
-		}
-
-		$sql = "SELECT *
-			FROM $table_name";
-		$result = mysql_unbuffered_query($sql, $this->db->get_db_connect_id());
-
-		if ($result != false)
-		{
-			$fields_cnt = mysql_num_fields($result);
-
-			// Get field information
-			$field = array();
-			for ($i = 0; $i < $fields_cnt; $i++)
-			{
-				$field[] = mysql_fetch_field($result, $i);
-			}
-			$field_set = array();
-
-			for ($j = 0; $j < $fields_cnt; $j++)
-			{
-				$field_set[] = $field[$j]->name;
-			}
-
-			$search			= array("\\", "'", "\x00", "\x0a", "\x0d", "\x1a", '"');
-			$replace		= array("\\\\", "\\'", '\0', '\n', '\r', '\Z', '\\"');
-			$fields			= implode(', ', $field_set);
-			$sql_data		= 'INSERT INTO ' . $table_name . ' (' . $fields . ') VALUES ';
-			$first_set		= true;
-			$query_len		= 0;
-			$max_len		= get_usable_memory();
-
-			while ($row = mysql_fetch_row($result))
-			{
-				$values = array();
-				if ($first_set)
-				{
-					$query = $sql_data . '(';
-				}
-				else
-				{
-					$query  .= ',(';
-				}
-
-				for ($j = 0; $j < $fields_cnt; $j++)
-				{
-					if (!isset($row[$j]) || is_null($row[$j]))
-					{
-						$values[$j] = 'NULL';
-					}
-					else if ($field[$j]->numeric && ($field[$j]->type !== 'timestamp'))
-					{
-						$values[$j] = $row[$j];
-					}
-					else
-					{
-						$values[$j] = "'" . str_replace($search, $replace, $row[$j]) . "'";
-					}
-				}
-				$query .= implode(', ', $values) . ')';
-
-				$query_len += strlen($query);
-				if ($query_len > $max_len)
-				{
-					$this->flush($query . ";\n\n");
-					$query = '';
-					$query_len = 0;
-					$first_set = true;
-				}
-				else
-				{
-					$first_set = false;
-				}
-			}
-			mysql_free_result($result);
-
-			// check to make sure we have nothing left to flush
-			if (!$first_set && $query)
-			{
-				$this->flush($query . ";\n\n");
-			}
-		}
-	}
-
-	/**
 	* Extracts database table structure (for MySQLi or MySQL 3.23.20+)
 	*
 	* @param	string	$table_name	name of the database table
diff --git a/phpBB/phpbb/db/tools/tools.php b/phpBB/phpbb/db/tools/tools.php
index d128df96c4..1250a8901d 100644
--- a/phpBB/phpbb/db/tools/tools.php
+++ b/phpBB/phpbb/db/tools/tools.php
@@ -74,37 +74,6 @@ class tools implements tools_interface
 				'VARBINARY'	=> 'varbinary(255)',
 			),
 
-			'mysql_40'	=> array(
-				'INT:'		=> 'int(%d)',
-				'BINT'		=> 'bigint(20)',
-				'ULINT'		=> 'INT(10) UNSIGNED',
-				'UINT'		=> 'mediumint(8) UNSIGNED',
-				'UINT:'		=> 'int(%d) UNSIGNED',
-				'TINT:'		=> 'tinyint(%d)',
-				'USINT'		=> 'smallint(4) UNSIGNED',
-				'BOOL'		=> 'tinyint(1) UNSIGNED',
-				'VCHAR'		=> 'varbinary(255)',
-				'VCHAR:'	=> 'varbinary(%d)',
-				'CHAR:'		=> 'binary(%d)',
-				'XSTEXT'	=> 'blob',
-				'XSTEXT_UNI'=> 'blob',
-				'STEXT'		=> 'blob',
-				'STEXT_UNI'	=> 'blob',
-				'TEXT'		=> 'blob',
-				'TEXT_UNI'	=> 'blob',
-				'MTEXT'		=> 'mediumblob',
-				'MTEXT_UNI'	=> 'mediumblob',
-				'TIMESTAMP'	=> 'int(11) UNSIGNED',
-				'DECIMAL'	=> 'decimal(5,2)',
-				'DECIMAL:'	=> 'decimal(%d,2)',
-				'PDECIMAL'	=> 'decimal(6,3)',
-				'PDECIMAL:'	=> 'decimal(%d,3)',
-				'VCHAR_UNI'	=> 'blob',
-				'VCHAR_UNI:'=> array('varbinary(%d)', 'limit' => array('mult', 3, 255, 'blob')),
-				'VCHAR_CI'	=> 'blob',
-				'VARBINARY'	=> 'varbinary(255)',
-			),
-
 			'oracle'	=> array(
 				'INT:'		=> 'number(%d)',
 				'BINT'		=> 'number(20)',
@@ -197,21 +166,6 @@ class tools implements tools_interface
 		// Determine mapping database type
 		switch ($this->db->get_sql_layer())
 		{
-			case 'mysql':
-				$this->sql_layer = 'mysql_40';
-			break;
-
-			case 'mysql4':
-				if (version_compare($this->db->sql_server_info(true), '4.1.3', '>='))
-				{
-					$this->sql_layer = 'mysql_41';
-				}
-				else
-				{
-					$this->sql_layer = 'mysql_40';
-				}
-			break;
-
 			case 'mysqli':
 				$this->sql_layer = 'mysql_41';
 			break;
@@ -240,8 +194,6 @@ class tools implements tools_interface
 	{
 		switch ($this->db->get_sql_layer())
 		{
-			case 'mysql':
-			case 'mysql4':
 			case 'mysqli':
 				$sql = 'SHOW TABLES';
 			break;
@@ -359,7 +311,6 @@ class tools implements tools_interface
 
 				switch ($this->sql_layer)
 				{
-					case 'mysql_40':
 					case 'mysql_41':
 					case 'sqlite3':
 						$table_sql .= ",\n\t PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ')';
@@ -381,7 +332,6 @@ class tools implements tools_interface
 				$statements[] = $table_sql;
 			break;
 
-			case 'mysql_40':
 			case 'sqlite3':
 				$table_sql .= "\n);";
 				$statements[] = $table_sql;
@@ -834,7 +784,6 @@ class tools implements tools_interface
 
 		switch ($this->sql_layer)
 		{
-			case 'mysql_40':
 			case 'mysql_41':
 				$sql = "SHOW COLUMNS FROM $table_name";
 			break;
@@ -911,7 +860,6 @@ class tools implements tools_interface
 	{
 		switch ($this->sql_layer)
 		{
-			case 'mysql_40':
 			case 'mysql_41':
 				$sql = 'SHOW KEYS
 					FROM ' . $table_name;
@@ -936,7 +884,7 @@ class tools implements tools_interface
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			if (($this->sql_layer == 'mysql_40' || $this->sql_layer == 'mysql_41') && !$row['Non_unique'])
+			if ($this->sql_layer == 'mysql_41' && !$row['Non_unique'])
 			{
 				continue;
 			}
@@ -971,7 +919,6 @@ class tools implements tools_interface
 	{
 		switch ($this->sql_layer)
 		{
-			case 'mysql_40':
 			case 'mysql_41':
 				$sql = 'SHOW KEYS
 					FROM ' . $table_name;
@@ -996,7 +943,7 @@ class tools implements tools_interface
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			if (($this->sql_layer == 'mysql_40' || $this->sql_layer == 'mysql_41') && ($row['Non_unique'] || $row[$col] == 'PRIMARY'))
+			if ($this->sql_layer == 'mysql_41' && ($row['Non_unique'] || $row[$col] == 'PRIMARY'))
 			{
 				continue;
 			}
@@ -1094,7 +1041,6 @@ class tools implements tools_interface
 
 		switch ($this->sql_layer)
 		{
-			case 'mysql_40':
 			case 'mysql_41':
 				$sql .= " {$column_type} ";
 
@@ -1248,7 +1194,6 @@ class tools implements tools_interface
 
 		switch ($this->sql_layer)
 		{
-			case 'mysql_40':
 			case 'mysql_41':
 				$after = (!empty($column_data['after'])) ? ' AFTER ' . $column_data['after'] : '';
 				$statements[] = 'ALTER TABLE `' . $table_name . '` ADD COLUMN `' . $column_name . '` ' . $column_data['column_type_sql'] . $after;
@@ -1281,7 +1226,6 @@ class tools implements tools_interface
 
 		switch ($this->sql_layer)
 		{
-			case 'mysql_40':
 			case 'mysql_41':
 				$statements[] = 'ALTER TABLE `' . $table_name . '` DROP COLUMN `' . $column_name . '`';
 			break;
@@ -1360,7 +1304,6 @@ class tools implements tools_interface
 
 		switch ($this->sql_layer)
 		{
-			case 'mysql_40':
 			case 'mysql_41':
 				$index_name = $this->check_index_name_length($table_name, $index_name, false);
 				$statements[] = 'DROP INDEX ' . $index_name . ' ON ' . $table_name;
@@ -1422,7 +1365,6 @@ class tools implements tools_interface
 
 		switch ($this->sql_layer)
 		{
-			case 'mysql_40':
 			case 'mysql_41':
 				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD PRIMARY KEY (' . implode(', ', $column) . ')';
 			break;
@@ -1500,7 +1442,6 @@ class tools implements tools_interface
 				$statements[] = 'CREATE UNIQUE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
 			break;
 
-			case 'mysql_40':
 			case 'mysql_41':
 				$index_name = $this->check_index_name_length($table_name, $index_name);
 				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD UNIQUE INDEX ' . $index_name . '(' . implode(', ', $column) . ')';
@@ -1517,11 +1458,7 @@ class tools implements tools_interface
 	{
 		$statements = array();
 
-		// remove index length unless MySQL4
-		if ('mysql_40' != $this->sql_layer)
-		{
-			$column = preg_replace('#:.*$#', '', $column);
-		}
+		$column = preg_replace('#:.*$#', '', $column);
 
 		switch ($this->sql_layer)
 		{
@@ -1531,17 +1468,6 @@ class tools implements tools_interface
 				$statements[] = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
 			break;
 
-			case 'mysql_40':
-				// add index size to definition as required by MySQL4
-				foreach ($column as $i => $col)
-				{
-					if (false !== strpos($col, ':'))
-					{
-						list($col, $index_size) = explode(':', $col);
-						$column[$i] = "$col($index_size)";
-					}
-				}
-			// no break
 			case 'mysql_41':
 				$index_name = $this->check_index_name_length($table_name, $index_name);
 				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD INDEX ' . $index_name . ' (' . implode(', ', $column) . ')';
@@ -1609,7 +1535,6 @@ class tools implements tools_interface
 
 		switch ($this->sql_layer)
 		{
-			case 'mysql_40':
 			case 'mysql_41':
 				$sql = 'SHOW KEYS
 					FROM ' . $table_name;
@@ -1634,7 +1559,7 @@ class tools implements tools_interface
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			if (($this->sql_layer == 'mysql_40' || $this->sql_layer == 'mysql_41') && !$row['Non_unique'])
+			if ($this->sql_layer == 'mysql_41' && !$row['Non_unique'])
 			{
 				continue;
 			}
@@ -1677,7 +1602,6 @@ class tools implements tools_interface
 
 		switch ($this->sql_layer)
 		{
-			case 'mysql_40':
 			case 'mysql_41':
 				$statements[] = 'ALTER TABLE `' . $table_name . '` CHANGE `' . $column_name . '` `' . $column_name . '` ' . $column_data['column_type_sql'];
 			break;
@@ -1826,7 +1750,6 @@ class tools implements tools_interface
 	{
 		switch ($this->sql_layer)
 		{
-			case 'mysql_40':
 			case 'mysql_41':
 			case 'sqlite3':
 				// Not supported
diff --git a/phpBB/phpbb/install/helper/database.php b/phpBB/phpbb/install/helper/database.php
index fa5a10c6fc..51fd18f874 100644
--- a/phpBB/phpbb/install/helper/database.php
+++ b/phpBB/phpbb/install/helper/database.php
@@ -45,15 +45,6 @@ class database
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> true,
 		),
-		'mysql'		=> array(
-			'LABEL'			=> 'MySQL',
-			'SCHEMA'		=> 'mysql',
-			'MODULE'		=> 'mysql',
-			'DELIM'			=> ';',
-			'DRIVER'		=> 'phpbb\db\driver\mysql',
-			'AVAILABLE'		=> true,
-			'2.0.x'			=> true,
-		),
 		'mssql_odbc'=>	array(
 			'LABEL'			=> 'MS SQL Server [ ODBC ]',
 			'SCHEMA'		=> 'mssql',
@@ -256,7 +247,6 @@ class database
 		$dbms_info = $this->get_available_dbms($dbms);
 		switch ($dbms_info[$dbms]['SCHEMA'])
 		{
-			case 'mysql':
 			case 'mysql_41':
 				$prefix_length = 36;
 			break;
@@ -382,14 +372,6 @@ class database
 			// Check if database version is supported
 			switch ($dbms)
 			{
-				case 'mysqli':
-					if (version_compare($db->sql_server_info(true), '4.1.3', '<'))
-					{
-						$errors[] = array(
-							'title' => 'INST_ERR_DB_NO_MYSQLI',
-						);
-					}
-				break;
 				case 'sqlite3':
 					if (version_compare($db->sql_server_info(true), '3.6.15', '<'))
 					{
diff --git a/phpBB/phpbb/install/module/install_database/task/create_schema.php b/phpBB/phpbb/install/module/install_database/task/create_schema.php
index a5635d5dbe..983bb42122 100644
--- a/phpBB/phpbb/install/module/install_database/task/create_schema.php
+++ b/phpBB/phpbb/install/module/install_database/task/create_schema.php
@@ -129,14 +129,7 @@ class create_schema extends \phpbb\install\task_base
 
 		if ($dbms === 'mysql')
 		{
-			if (version_compare($this->db->sql_server_info(true), '4.1.3', '>='))
-			{
-				$schema_name .= '_41';
-			}
-			else
-			{
-				$schema_name .= '_40';
-			}
+			$schema_name .= '_41';
 		}
 
 		$db_schema_path = $this->phpbb_root_path . 'install/schemas/' . $schema_name . '_schema.sql';
diff --git a/phpBB/phpbb/install/module/install_database/task/set_up_database.php b/phpBB/phpbb/install/module/install_database/task/set_up_database.php
index 49c8ea23ad..4da5ece228 100644
--- a/phpBB/phpbb/install/module/install_database/task/set_up_database.php
+++ b/phpBB/phpbb/install/module/install_database/task/set_up_database.php
@@ -102,14 +102,7 @@ class set_up_database extends \phpbb\install\task_base
 
 		if ($dbms === 'mysql')
 		{
-			if (version_compare($this->db->sql_server_info(true), '4.1.3', '>='))
-			{
-				$schema_name .= '_41';
-			}
-			else
-			{
-				$schema_name .= '_40';
-			}
+			$schema_name .= '_41';
 		}
 
 		$this->schema_file_path = $this->phpbb_root_path . 'install/schemas/' . $schema_name . '_schema.sql';
diff --git a/phpBB/phpbb/search/fulltext_mysql.php b/phpBB/phpbb/search/fulltext_mysql.php
index 4d3e13663d..8bdc31e128 100644
--- a/phpBB/phpbb/search/fulltext_mysql.php
+++ b/phpBB/phpbb/search/fulltext_mysql.php
@@ -154,7 +154,7 @@ class fulltext_mysql extends \phpbb\search\base
 	*/
 	public function init()
 	{
-		if ($this->db->get_sql_layer() != 'mysql4' && $this->db->get_sql_layer() != 'mysqli')
+		if ($this->db->get_sql_layer() != 'mysqli')
 		{
 			return $this->user->lang['FULLTEXT_MYSQL_INCOMPATIBLE_DATABASE'];
 		}
@@ -1005,14 +1005,7 @@ class fulltext_mysql extends \phpbb\search\base
 		if (!isset($this->stats['post_subject']))
 		{
 			$alter_entry = array();
-			if ($this->db->get_sql_layer() == 'mysqli' || version_compare($this->db->sql_server_info(true), '4.1.3', '>='))
-			{
-				$alter_entry[] = 'MODIFY post_subject varchar(255) COLLATE utf8_unicode_ci DEFAULT \'\' NOT NULL';
-			}
-			else
-			{
-				$alter_entry[] = 'MODIFY post_subject text NOT NULL';
-			}
+			$alter_entry[] = 'MODIFY post_subject varchar(255) COLLATE utf8_unicode_ci DEFAULT \'\' NOT NULL';
 			$alter_entry[] = 'ADD FULLTEXT (post_subject)';
 			$alter_list[] = $alter_entry;
 		}
@@ -1020,15 +1013,7 @@ class fulltext_mysql extends \phpbb\search\base
 		if (!isset($this->stats['post_content']))
 		{
 			$alter_entry = array();
-			if ($this->db->get_sql_layer() == 'mysqli' || version_compare($this->db->sql_server_info(true), '4.1.3', '>='))
-			{
-				$alter_entry[] = 'MODIFY post_text mediumtext COLLATE utf8_unicode_ci NOT NULL';
-			}
-			else
-			{
-				$alter_entry[] = 'MODIFY post_text mediumtext NOT NULL';
-			}
-
+			$alter_entry[] = 'MODIFY post_text mediumtext COLLATE utf8_unicode_ci NOT NULL';
 			$alter_entry[] = 'ADD FULLTEXT post_content (post_text, post_subject)';
 			$alter_list[] = $alter_entry;
 		}
diff --git a/phpBB/phpbb/search/fulltext_native.php b/phpBB/phpbb/search/fulltext_native.php
index ecebbd37cd..295c2cf33c 100644
--- a/phpBB/phpbb/search/fulltext_native.php
+++ b/phpBB/phpbb/search/fulltext_native.php
@@ -889,7 +889,6 @@ class fulltext_native extends \phpbb\search\base
 
 			switch ($this->db->get_sql_layer())
 			{
-				case 'mysql4':
 				case 'mysqli':
 
 					// 3.x does not support SQL_CALC_FOUND_ROWS
@@ -1184,7 +1183,6 @@ class fulltext_native extends \phpbb\search\base
 		{
 			switch ($this->db->get_sql_layer())
 			{
-				case 'mysql4':
 				case 'mysqli':
 //					$select = 'SQL_CALC_FOUND_ROWS ' . $select;
 					$is_mysql = true;
diff --git a/phpBB/phpbb/search/fulltext_sphinx.php b/phpBB/phpbb/search/fulltext_sphinx.php
index d8331d3815..6230f92da3 100644
--- a/phpBB/phpbb/search/fulltext_sphinx.php
+++ b/phpBB/phpbb/search/fulltext_sphinx.php
@@ -214,7 +214,7 @@ class fulltext_sphinx
 	*/
 	public function init()
 	{
-		if ($this->db->get_sql_layer() != 'mysql' && $this->db->get_sql_layer() != 'mysql4' && $this->db->get_sql_layer() != 'mysqli' && $this->db->get_sql_layer() != 'postgres')
+		if ($this->db->get_sql_layer() != 'mysqli' && $this->db->get_sql_layer() != 'postgres')
 		{
 			return $this->user->lang['FULLTEXT_SPHINX_WRONG_DATABASE'];
 		}
@@ -233,7 +233,7 @@ class fulltext_sphinx
 	protected function config_generate()
 	{
 		// Check if Database is supported by Sphinx
-		if ($this->db->get_sql_layer() =='mysql' || $this->db->get_sql_layer() == 'mysql4' || $this->db->get_sql_layer() == 'mysqli')
+		if ($this->db->get_sql_layer() == 'mysqli')
 		{
 			$this->dbtype = 'mysql';
 		}