Merge branch 'master' of git.raylu.net:pathery

Conflicts:
	includes/mapoftheday.php

1 files changed, 19 insertions, 0 deletions

diff --git a/update notes.txt b/update notes.txt
index 1ff219c..df95be1 100644
--- a/update notes.txt
+++ b/update notes.txt
@@ -1,3 +1,22 @@
+
+Add Table:
+
+CREATE TABLE IF NOT EXISTS `chatUsers` (
+  `ID` int(11) NOT NULL AUTO_INCREMENT,
+  `userID` int(11) NOT NULL,
+  `channel` int(11) NOT NULL,
+  `client` varchar(16) NOT NULL,
+  `dateEntered` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `dateLastActive` timestamp NULL DEFAULT NULL,
+  `isHere` tinyint(1) NOT NULL,
+  `isAdmin` tinyint(1) NOT NULL,
+  `isMod` tinyint(1) NOT NULL,
+  PRIMARY KEY (`ID`),
+  KEY `userID` (`userID`,`channel`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+
+ --  Did we do everything below? I think we did.. Jan 13 2014?
 For next update:
 - Move the new columns from BlueRaja's database over to your other databases (see also: db updates.sql.  Most, but not all, are in there.
     I don't think Snap added his stuff there).  Make sure to get not only the type, but nullable/default as well.