Permalink
Browse files

Merge branch 'master' of github.com:bvds/andes

  • Loading branch information...
2 parents 373786e + 4cc1739 commit 34bcc3a35c3a0234f2dd7f6fec6c98b33e67aacd @bvds committed Dec 22, 2013
Showing with 5 additions and 4 deletions.
  1. +1 −0 INSTALL
  2. +4 −4 LogProcessing/database/create_PROBLEM_ATTEMPT.sql
View
@@ -101,6 +101,7 @@ cd ../ # return to Andes root directory
# Then set the root password (choose your own) and restart:
/usr/bin/mysqladmin -u root password 'mysql-password'
/sbin/service mysqld restart
+# Currently, the root password cannot be empty; see bug #2277.
# (In OS X, go to http://dev.mysql.com, install mysql and MySQLStartupItem,
# add /usr/local/mysql/bin to PATH in ~/.profile,
# execute "(cd /usr/local/lib;sudo ln -s ../mysql/lib/lib*.{a,dylib} .)"
@@ -1,8 +1,8 @@
CREATE TABLE `PROBLEM_ATTEMPT` (
- `userName` varchar(50) NOT NULL COMMENT 'Needs to hold encrypted names',
- `startTime` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
- `clientID` varchar(50) NOT NULL default 'fill in clientID' COMMENT 'Size should match +client-id-width+ in Help/database.cl',
- `userProblem` varchar(50) default NULL COMMENT 'The problem the user asks for when communicating with server. May or may not exist. If it exists, it should match up with a given problem name in STUDENT_DATASET',
+ `userName` varchar(50) NOT NULL DEFAULT 'defaultName' COMMENT 'Needs to hold encrypted names',
+ `startTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+ `clientID` varchar(50) NOT NULL DEFAULT 'fill in clientID' COMMENT 'Size should match +client-id-width+ in Help/database.cl',
+ `userProblem` varchar(50) DEFAULT NULL COMMENT 'The problem the user asks for when communicating with server. May or may not exist. If it exists, it should match up with a given problem name in STUDENT_DATASET',
`userSection` varchar(50) NOT NULL DEFAULT 'defaultSection' COMMENT 'The section the user is enrolled in. Must match up with a section in CLASS_INFORMATION.',
`extra` varchar(50) DEFAULT NULL COMMENT 'Identifiers for multi-user sessions or copied sessions or other such stuff.',
PRIMARY KEY (`clientID`),

0 comments on commit 34bcc3a

Please sign in to comment.