Changeset 35

Timestamp:

11/19/08 13:25:48 (17 years ago)

Author:

yumileroy

Message:

[svn] * Fixing some typos in SQL files.
* Applying proper structure to SQL updates.
* Fixing ImpConfig? compile problems.
* Moving INSTALL to INSTALL.linux to avoid autoconf collisions.

Original author: XTZGZoReX
Date: 2008-10-10 15:20:27-05:00

Location:

trunk

Files:

• INSTALL.linux (moved) (moved from trunk/INSTALL) (1 prop)
• sql/create_mysql.sql (modified) (2 diffs)
• sql/drop_mysql.sql (modified) (1 diff)
• sql/updates/10_world.sql (moved) (moved from trunk/sql/updates/10_instantiated_battlegrounds.sql) (1 prop)
• sql/updates/11_characters.sql (moved) (moved from trunk/sql/updates/11_arena_points_characters.sql) (1 prop)
• sql/updates/34_world.sql (added)
• sql/world.sql (modified) (1 diff)
• src/game/ObjectMgr.cpp (modified) (1 diff)
• src/trinityrealm/AuthSocket.cpp (modified) (1 diff)

trunk/sql/create_mysql.sql

@@ -1 @@
-GRANT USAGE ON * . * TO 'mangos'@'localhost' IDENTIFIED BY 'mangos' WITH MAX_QUERIES_PER_HOUR 0 MAX_CONNECTIONS_PER_HOUR 0 MAX_UPDATES_PER_HOUR 0 ;
+GRANT USAGE ON * . * TO 'trinity'@'localhost' IDENTIFIED BY 'trinity' WITH MAX_QUERIES_PER_HOUR 0 MAX_CONNECTIONS_PER_HOUR 0 MAX_UPDATES_PER_HOUR 0 ;
 
-CREATE DATABASE `mangos` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+CREATE DATABASE `world` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
 
 CREATE DATABASE `characters` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
@@ -7 +7 @@
 CREATE DATABASE `realmd` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
 
-GRANT ALL PRIVILEGES ON `mangos` . * TO 'mangos'@'localhost' WITH GRANT OPTION;
+GRANT ALL PRIVILEGES ON `world` . * TO 'trinity'@'localhost' WITH GRANT OPTION;
 
-GRANT ALL PRIVILEGES ON `characters` . * TO 'mangos'@'localhost' WITH GRANT OPTION;
+GRANT ALL PRIVILEGES ON `characters` . * TO 'trinity'@'localhost' WITH GRANT OPTION;
 
-GRANT ALL PRIVILEGES ON `realmd` . * TO 'mangos'@'localhost' WITH GRANT OPTION;
+GRANT ALL PRIVILEGES ON `realmd` . * TO 'trinity'@'localhost' WITH GRANT OPTION;
 

trunk/sql/drop_mysql.sql

@@ -1 @@
-REVOKE ALL PRIVILEGES ON * . * FROM 'mangos'@'localhost';
+REVOKE ALL PRIVILEGES ON * . * FROM 'trinity'@'localhost';
 
-REVOKE ALL PRIVILEGES ON `mangos` . * FROM 'mangos'@'localhost';
+REVOKE ALL PRIVILEGES ON `mangos` . * FROM 'trinity'@'localhost';
 
-REVOKE GRANT OPTION ON `mangos` . * FROM 'mangos'@'localhost';
+REVOKE GRANT OPTION ON `mangos` . * FROM 'trinity'@'localhost';
 
-REVOKE ALL PRIVILEGES ON `characters` . * FROM 'mangos'@'localhost';
+REVOKE ALL PRIVILEGES ON `characters` . * FROM 'trinity'@'localhost';
 
-REVOKE GRANT OPTION ON `characters` . * FROM 'mangos'@'localhost';
+REVOKE GRANT OPTION ON `characters` . * FROM 'trinity'@'localhost';
 
-REVOKE ALL PRIVILEGES ON `realmd` . * FROM 'mangos'@'localhost';
+REVOKE ALL PRIVILEGES ON `realmd` . * FROM 'trinity'@'localhost';
 
-REVOKE GRANT OPTION ON `realmd` . * FROM 'mangos'@'localhost';
+REVOKE GRANT OPTION ON `realmd` . * FROM 'trinity'@'localhost';
 
-DELETE FROM `user` WHERE CONVERT( User USING utf8 ) = CONVERT( 'mangos' USING utf8 ) AND CONVERT( Host USING utf8 ) = CONVERT( 'localhost' USING utf8 ) ;
+DELETE FROM `user` WHERE CONVERT( User USING utf8 ) = CONVERT( 'trinity' USING utf8 ) AND CONVERT( Host USING utf8 ) = CONVERT( 'localhost' USING utf8 ) ;
 
-DROP DATABASE IF EXISTS `mangos` ;
+DROP DATABASE IF EXISTS `world` ;
 
 DROP DATABASE IF EXISTS `characters` ;

trunk/sql/world.sql

@@ -1 +1 @@
 -- MySQL dump 10.11
 --
--- Host: localhost    Database: mangos
+-- Host: localhost    Database: world
 -- ------------------------------------------------------
 -- Server version       5.0.56-nt

trunk/src/game/ObjectMgr.cpp

@@ -2079 +2079 @@
     // Load playercreate spells
     {
-        //                                                0     1      2      3
-        QueryResult *result = WorldDatabase.Query("SELECT race, class, Spell, Active FROM playercreateinfo_spell");
 
         QueryResult *result = NULL;

trunk/src/trinityrealm/AuthSocket.cpp

@@ -373 +373 @@
         int MaxBuild = sConfig.GetIntDefault("MaxBuild", 8606);
 
-        if(ch->build >= MinBuild && ch->build <= MaxBuild)
+        if(ch->build >= MinBuild && ch->build <= MaxBuild) {
         valid_version=true;
-        break;
-    }
-    else
+    } else {
         valid_version=false;
+    };
 
     /// <ul><li> if this is a valid version