Browse Source

Added update for global_tasks sql in update.bat and added IF NOT EXISTS to tables to stop error if table already exists

zeratul 19 years ago
parent
commit
7038f561ce

+ 1 - 1
datapack_development/sql/gameservers.sql

@@ -1,4 +1,4 @@
-CREATE TABLE `gameservers` (
+CREATE TABLE IF NOT EXISTS `gameservers` (
   `server_id` int(11) NOT NULL default '0',
   `hexid` varchar(50) NOT NULL default '',
   `host` varchar(50) NOT NULL default '',

+ 1 - 1
datapack_development/sql/global_tasks.sql

@@ -2,7 +2,7 @@
 -- Table structure for table `global_tasks`
 --
 
-CREATE TABLE global_tasks (
+CREATE TABLE IF NOT EXISTS global_tasks (
   task_name char(50) NOT NULL default '',
   last_activation decimal(20,0) NOT NULL default 0,
   PRIMARY KEY  (task_name)

+ 3 - 2
datapack_development/tools/upgrade.bat

@@ -6,9 +6,9 @@ REM ############################################
 
 
 REM MYSQL 4.1
-set mysqlBinPath=C:\Program Files\MySQL\MySQL Server 4.1\bin
+set mysqlBinPath=F:\Program Files\MySQL\MySQL Server 4.1\bin
 set user=root
-set pass=
+set pass=root
 set DBname=l2jdb
 set DBHost=localhost
 
@@ -31,6 +31,7 @@ echo Installing new content.
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/class_list.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/droplist.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/etcitem.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/global_tasks.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/henna_trees.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/henna.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/locations.sql