From 4f402465bf41c88876a499cacfc6bdc1762dfe44 Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Wed, 1 Aug 2018 15:05:10 +0200
Subject: [ticket/12628] Introduce debug.memory

Also fix one debug.sql_explain missing from the previous PR

PHPBB3-12628
---
 phpBB/install/convert/convertor.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'phpBB/install/convert/convertor.php')

diff --git a/phpBB/install/convert/convertor.php b/phpBB/install/convert/convertor.php
index 5118651b71..e79ad64012 100644
--- a/phpBB/install/convert/convertor.php
+++ b/phpBB/install/convert/convertor.php
@@ -63,7 +63,7 @@ class convertor
 	{
 		global $user, $phpbb_root_path, $phpEx, $db, $lang, $config, $cache, $auth;
 		global $convert, $convert_row, $message_parser, $skip_rows, $language;
-		global $request, $phpbb_dispatcher;
+		global $request, $phpbb_dispatcher, $phpbb_container;
 
 		$phpbb_config_php_file = new \phpbb\config_php_file($phpbb_root_path, $phpEx);
 		extract($phpbb_config_php_file->get_all());
@@ -687,7 +687,7 @@ class convertor
 
 				$this->template->assign_block_vars('checks', array(
 					'TITLE'		=> "skip_rows = $skip_rows",
-					'RESULT'	=> $rows . ((defined('DEBUG') && function_exists('memory_get_usage')) ? ceil(memory_get_usage()/1024) . ' ' . $user->lang['KIB'] : ''),
+					'RESULT'	=> $rows . (($phpbb_container->getParameter('debug.memory') && function_exists('memory_get_usage')) ? ceil(memory_get_usage()/1024) . ' ' . $user->lang['KIB'] : ''),
 				));
 
 				$mtime = explode(' ', microtime());
@@ -920,6 +920,7 @@ class convertor
 	{
 		global $user, $db, $phpbb_root_path, $phpEx, $config, $cache;
 		global $convert;
+		global $phpbb_container;
 
 		include_once ($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 
@@ -959,7 +960,7 @@ class convertor
 			sync('topic', 'range', 'topic_id BETWEEN ' . $sync_batch . ' AND ' . $end, true, true);
 
 			$this->template->assign_block_vars('checks', array(
-				'TITLE'		=> sprintf($user->lang['SYNC_TOPIC_ID'], $sync_batch, ($sync_batch + $batch_size)) . ((defined('DEBUG') && function_exists('memory_get_usage')) ? ' [' . ceil(memory_get_usage()/1024) . ' ' . $user->lang['KIB'] . ']' : ''),
+				'TITLE'		=> sprintf($user->lang['SYNC_TOPIC_ID'], $sync_batch, ($sync_batch + $batch_size)) . (($phpbb_container->getParameter('debug.memory') && function_exists('memory_get_usage')) ? ' [' . ceil(memory_get_usage()/1024) . ' ' . $user->lang['KIB'] . ']' : ''),
 				'RESULT'	=> $user->lang['DONE'],
 			));
 
-- 
cgit v1.2.1


From bd02c5bd085e957aa4341e7fc2df2199081ab069 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 6 Oct 2019 12:07:35 +0200
Subject: [ticket/16051] Remove mysql driver as it's no longer supported in PHP
 >= 7.0

PHPBB3-16051
---
 phpBB/install/convert/convertor.php | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'phpBB/install/convert/convertor.php')

diff --git a/phpBB/install/convert/convertor.php b/phpBB/install/convert/convertor.php
index e79ad64012..09088fe824 100644
--- a/phpBB/install/convert/convertor.php
+++ b/phpBB/install/convert/convertor.php
@@ -148,16 +148,6 @@ class convertor
 				$convert->src_truncate_statement = 'DELETE FROM ';
 				break;
 
-			// Thanks MySQL, for silently converting...
-			case 'mysql':
-			case 'mysql4':
-				if (version_compare($src_db->sql_server_info(true, false), '4.1.3', '>='))
-				{
-					$convert->mysql_convert = true;
-				}
-				$convert->src_truncate_statement = 'TRUNCATE TABLE ';
-				break;
-
 			case 'mysqli':
 				$convert->mysql_convert = true;
 				$convert->src_truncate_statement = 'TRUNCATE TABLE ';
@@ -748,8 +738,6 @@ class convertor
 						switch ($db->get_sql_layer())
 						{
 							// If MySQL, we'll wait to have num_wait_rows rows to submit at once
-							case 'mysql':
-							case 'mysql4':
 							case 'mysqli':
 								$waiting_rows[] = '(' . implode(', ', $insert_values) . ')';
 
@@ -1258,9 +1246,7 @@ class convertor
 		global $db, $user;
 		global $convert;
 
-		// Can we use IGNORE with this DBMS?
-		$sql_ignore = (strpos($db->get_sql_layer(), 'mysql') === 0 && !defined('DEBUG')) ? 'IGNORE ' : '';
-		$insert_query = 'INSERT ' . $sql_ignore . 'INTO ' . $schema['target'] . ' (';
+		$insert_query = 'INSERT INTO ' . $schema['target'] . ' (';
 
 		$aliases = array();
 
-- 
cgit v1.2.1