diff --git a/utils/scripts/db_update.pl b/utils/scripts/db_update.pl index 5b8b44712..d2462530a 100644 --- a/utils/scripts/db_update.pl +++ b/utils/scripts/db_update.pl @@ -257,7 +257,7 @@ sub Run_Database_Check{ $file_name = trim($m_d{$val}[1]); print "Running Update: " . $val . " - " . $file_name . "\n"; print GetMySQLResultFromFile("db_update/$file_name"); - print GetMySQLResult("UPDATE `db_version` SET `version` = $val"); + print GetMySQLResult("UPDATE `db_version` SET `version` = $val WHERE `version` < $val"); } print "Continuing World Bootup...\n"; return; diff --git a/utils/sql/db_update_manifest.txt b/utils/sql/db_update_manifest.txt index 1310e0753..44983d532 100644 --- a/utils/sql/db_update_manifest.txt +++ b/utils/sql/db_update_manifest.txt @@ -256,6 +256,7 @@ 5256|2471_required_aa_updates.sql 5257|2482_required_start_zones.sql 5258|2504_required_aa_updates.sql +8000|mercs.sql|SHOW TABLES LIKE 'merc_stats'|empty| 9000|2013_02_18_Merc_Rules_and_Tables.sql|SELECT * FROM `rule_values` WHERE `rule_name` LIKE '%Mercs:ResurrectRadius%'|empty| 9001|2013_02_25_Impr_HT_LT.sql|SHOW TABLES LIKE 'merc_inventory'|empty| 9002|2013_03_1_Merc_Rules_and_Equipment.sql|SHOW TABLES LIKE 'merc_inventory'|empty| diff --git a/utils/sql/git/required/2014_09_20_ban_messages.sql b/utils/sql/git/required/2014_09_20_ban_messages.sql index 4612f9962..229f08776 100644 --- a/utils/sql/git/required/2014_09_20_ban_messages.sql +++ b/utils/sql/git/required/2014_09_20_ban_messages.sql @@ -1 +1 @@ -ALTER TABLE `account` ADD COLUMN `ban_reason` TEXT NULL DEFAULT NULL AFTER `expansion`, ADD COLUMN `suspend_reason` TEXT NULL DEFAULT NULL AFTER `ban_reason`; +ALTER TABLE `account` ADD COLUMN `ban_reason` TEXT NULL DEFAULT NULL, ADD COLUMN `suspend_reason` TEXT NULL DEFAULT NULL AFTER `ban_reason`;