From 21cf1a82a97654a9ce2ac4cd6abf55c8a98d8fc5 Mon Sep 17 00:00:00 2001
From: Leigh B Stoller <stoller@flux.utah.edu>
Date: Mon, 12 May 2014 13:18:10 -0600
Subject: [PATCH] Fix to previous revision.
---
sql/database-create.sql | 14 +++++++-------
sql/updates/4/393 | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/sql/database-create.sql b/sql/database-create.sql
index 134984877c..d4914d845d 100644
--- a/sql/database-create.sql
+++ b/sql/database-create.sql
@@ -5213,11 +5213,11 @@ CREATE TABLE `vlans` (
--
DROP TABLE IF EXISTS `web_sessions`;
-CREATE TABLE `web_sessions` (
- `session_id` varchar(128) binary NOT NULL default '',
+CREATE TABLE `web_sessions` (
+ `session_id` varchar(128) NOT NULL default '',
`session_expires` datetime NOT NULL default '0000-00-00 00:00:00',
- `session_data` text,
- PRIMARY KEY (`session_id`)
+ `session_data` text,
+ PRIMARY KEY (`session_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
--
@@ -5225,15 +5225,15 @@ CREATE TABLE `web_sessions` (
--
DROP TABLE IF EXISTS `web_tasks`;
-CREATE TABLE `web_tasks` (
- `task_id` varchar(128) binary NOT NULL default '',
+CREATE TABLE `web_tasks` (
+ `task_id` varchar(128) NOT NULL default '',
`created` datetime NOT NULL default '0000-00-00 00:00:00',
`modified` datetime NOT NULL default '0000-00-00 00:00:00',
`exited` datetime default NULL,
`process_id` int(11) default '0',
`object_uuid` varchar(40) NOT NULL default '',
`exitcode` tinyint(3) default '0',
- `task_data` text,
+ `task_data` text,
PRIMARY KEY (`task_id`),
KEY `object_uuid` (`object_uuid`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
diff --git a/sql/updates/4/393 b/sql/updates/4/393
index 3bf561cde3..e1f3cb2af0 100644
--- a/sql/updates/4/393
+++ b/sql/updates/4/393
@@ -21,7 +21,7 @@ sub DoUpdate($$$)
}
if (!DBTableExists("web_sessions")) {
DBQueryFatal("CREATE TABLE `web_sessions` ( ".
- " `session_id` varchar(128) binary NOT NULL default '', ".
+ " `session_id` varchar(128) NOT NULL default '', ".
" `session_expires` datetime NOT NULL ".
" default '0000-00-00 00:00:00', ".
" `session_data` text, ".
@@ -30,7 +30,7 @@ sub DoUpdate($$$)
}
if (!DBTableExists("web_tasks")) {
DBQueryFatal("CREATE TABLE `web_tasks` ( ".
- " `task_id` varchar(128) binary NOT NULL default '', ".
+ " `task_id` varchar(128) NOT NULL default '', ".
" `created` datetime NOT NULL ".
" default '0000-00-00 00:00:00', ".
" `modified` datetime NOT NULL ".
--
GitLab