Fix count and minor display issues

Signed-off-by: Shawn Bulen <bulens@pacbell.net>

Author: sbulen

other/upgrade.php

@@ -5089,7 +5089,7 @@ function doTheDelete(theCheck)
  * @param int $setSize The amount of entries after which to update the database.
  * @return bool
  */
-function MySQLConvertOldIp($targetTable, $oldCol, $newCol, $limit = 50000, $setSize = 100)
+function MySQLConvertOldIp($targetTable, $oldCol, $newCol, $limit = 10000, $setSize = 100)
 {
 	global $smcFunc, $step_progress;
 

other/upgrade_2-1_mysql.sql

@@ -378,6 +378,7 @@ INSERT INTO {$db_prefix}settings (variable, value) VALUES ('defaultMaxListItems'
 		array('variable')
 	);
 ---}
+---#
 
 ---# Disable Moderation Center Security if it doesn't exist
 ---{
@@ -876,7 +877,7 @@ VALUES
 ---#
 
 /******************************************************************************/
----- Adding background tasks support
+--- Adding background tasks support
 /******************************************************************************/
 ---# Adding the new table
 CREATE TABLE IF NOT EXISTS {$db_prefix}background_tasks (
@@ -3321,6 +3322,7 @@ CREATE TABLE IF NOT EXISTS {$db_prefix}board_permissions_view
 	deny smallint NOT NULL,
 	PRIMARY KEY (id_group, id_board, deny)
 ) ENGINE=MyISAM;
+---#
 
 ---# upgrade check
 ---{
@@ -3331,7 +3333,7 @@ $upcontext['skip_db_substeps'] = !in_array('id_group', $table_columns) || !in_ar
 ---}
 ---#
 
----#
+---# Truncate board_permissions view
 TRUNCATE {$db_prefix}board_permissions_view;
 ---#
 

other/upgrade_2-1_postgresql.sql

@@ -1061,7 +1061,7 @@ VALUES
 ---#
 
 /******************************************************************************/
----- Adding background tasks support
+--- Adding background tasks support
 /******************************************************************************/
 ---# Adding the sequence
 CREATE SEQUENCE IF NOT EXISTS {$db_prefix}background_tasks_seq;
@@ -2010,7 +2010,7 @@ CREATE TABLE IF NOT EXISTS {$db_prefix}moderator_groups (
 /******************************************************************************/
 --- Cleaning up integration hooks
 /******************************************************************************/
----#
+---# Deleting integration hooks
 DELETE FROM {$db_prefix}settings
 WHERE variable LIKE 'integrate_%';
 ---#
@@ -2150,6 +2150,7 @@ WHERE variable IN ('show_board_desc', 'display_quick_reply', 'show_mark_read', '
 		array('variable')
 	);
 ---}
+---#
 
 /******************************************************************************/
 --- Updating files that fetched from simplemachines.org
@@ -3098,7 +3099,7 @@ ALTER TABLE {$db_prefix}log_errors
 ---#
 
 /******************************************************************************/
---- update log_errors members ip with ipv6 support
+--- update members ip with ipv6 support
 /******************************************************************************/
 ---# upgrade check
 ---{
@@ -3108,7 +3109,7 @@ if (stripos($column_info['type'], 'inet') !== false)
 ---}
 ---#
 
----#
+---# update old columns on members
 ALTER TABLE {$db_prefix}members
 	ALTER member_ip DROP not null,
 	ALTER member_ip DROP default,
@@ -3594,6 +3595,7 @@ CREATE TABLE IF NOT EXISTS {$db_prefix}board_permissions_view
 	deny smallint NOT NULL,
 	PRIMARY KEY (id_group, id_board, deny)
 );
+---#
 
 ---# upgrade check
 ---{
@@ -3604,7 +3606,7 @@ $upcontext['skip_db_substeps'] = !in_array('id_group', $table_columns) || !in_ar
 ---}
 ---#
 
----#
+---# Truncate board_permissions view
 TRUNCATE {$db_prefix}board_permissions_view;
 ---#