cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-02 19:42:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into ezpz

Browse Source 
# Conflicts:
#	sql/characters.sql
This commit is contained in:
Tahir Akhlaq 2016-12-05 14:29:19 +00:00
commit a2d4879cdd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/characters.sql
View File

@ -46,4 +46,4 @@ CREATE TABLE `characters` (
`currentPartyGroupId` bigint(20) unsigned DEFAULT '0', `currentPartyGroupId` bigint(20) unsigned DEFAULT '0',
`currentRetainerGroupId` bigint(20) unsigned DEFAULT NULL, `currentRetainerGroupId` bigint(20) unsigned DEFAULT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=162 DEFAULT CHARSET=utf8; ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;

2
sql/users.sql
View File

@ -30,7 +30,7 @@ CREATE TABLE `users` (
`email` varchar(256) NOT NULL, `email` varchar(256) NOT NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE KEY `name_UNIQUE` (`name`) UNIQUE KEY `name_UNIQUE` (`name`)
) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8; ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --