gaulde

Hey. I recently cleaned my whole computer and I've been troubled by git, updates and SQLyog ever since. I'm currently trying to update SQL, since I keep getting the following error when opening mangos.exe: 2010-04-20 18:19:17 MaNGOS/0.16.0-DEV (* * Revision 9680 - 079b05f88e564758f0e4d643d4f7266fc9b6b4eb) for Win32 (little-endian) [world-daemon] 2010-04-20 18:19:17 <Ctrl-C> to stop. MM MM MM MM MMMMM MMMM MMMMM MM MM MM MM MMM MMM MM MM MMM MMM MMM MMM MMM MM MMM MMM MM MM MMM MM M MM MMMM MM MMM MM MM MMM MM M MM MMMMM MM MMMM MMM MM MM MMM MM M MM M MMM MM MMM MMMMMMM MM MM MMM MM MM MMM MM MM MM MMM MM MM MMM MM MM MMMMMMM MM MM MMM MMM MM MM MMM MMM MM MM MM MMM MM MM MMMMMM MMMM MMMMM MM MMM [url]http://getmangos.eu[/url] MMMMMM 2010-04-20 18:19:17 Using configuration file mangosd.conf. 2010-04-20 18:19:17 World Database: 127.0.0.1;3306;root;server1;mangos 2010-04-20 18:19:17 MySQL client library: 5.0.56 2010-04-20 18:19:17 MySQL server ver: 5.1.45-community 2010-04-20 18:19:17 ERROR:SQL: SELECT required_9663_01_mangos_mangos_string FROM db_version LIMIT 1 2010-04-20 18:19:17 ERROR:query ERROR: Unknown column 'required_9663_01_mangos_mangos_string' in 'field list' 2010-04-20 18:19:17 ERROR:Table `db_version` have field `required_9763_01_mangos_battleground_template` but expected `required_9663_01_mangos_mangos_string`! Not all sql updates applied? - Which lead me to update the core files - which again lead me to the git problem. The gittish problem is quite odd. I've had quite a few different ones, but the only one to persist is after trying to merge. I'll post it in a single post. EDIT: The log was way too big. The final lines were: warning: Cannot merge binary files: contrib/extractor/ad.exe (HEAD vs. origin/mangos-0.12) warning: Cannot merge binary files: contrib/vmap_extract_assembler_bin/vmapextract_v2.exe (HEAD vs. origin/mangos-0.12 And the erros seems to be loads of "conflicts". I suspect that every files have a hard time merging. I tried resetting and creating a new branch. All I end up with is the same and an irreversible load of oddnammed sql patches in the update folder. Anyways, way before I had these problems, it worked fine. Except for one weird thing: Alot of stuff was missing from the mangos database. (Always been using udb) It resulted in every NPC missing and probably quite a big bunch of the items. I decided to clear everything after many attempts to fix this, and now I'm stuck at a revision problem. It's the second time I clear it. First time I passed the revision problem, and all that was missing was the content. I'm running on Vista with the newest version of git, and I'm attempting to make a WoW 3.3.3 server. Thank you Best regards, Gaulde