I tried creating a new database, from scratch and this worked: 
 
Source: 
PEQ_2506 
then the rest of the tables (player,bots,views,qs) 
 
Per bad_captain's suggestion, 
 
/utils/sql/svn/2380_optional_merc_data 
/utils/sql/svn/2380_optional_merc_merchant_npctypes_update 
/utils/sql/svn/2380_optional_merc_rules 
 
/utils/sql/svn/mercs.sql 
/utils/sql/git/required/2013_02_18_Merc_Rules_and_Tables 
/utils/sql/git/optional/2013_02_18_Merc_Spells 
/utils/sql/git/required/2013_02_25_Impr_HT_LT 
 
Now when sourcing  
 
/utils/sql/git/required/2013_03_1_Merc_Rules_and_Equipment 
 
there was no more error! 
 
then source 
 
/utils/sql/git/optional/2013_03_14_Merc_Spells 
/utils/sql/git/optional/2013_03_18_Merc_Spells 
 
I haven't logged in yet, but at least that got rid of the sourcing error. 
 
I will try this on my main db (deleting all merc related tables first) and then post back. 
		
	
		
		
		
		
		
		
		
		
		
	
		
		
	
	
	 |