Merge branch 'mymaster'

sql/database-create.sql

@@ -76,6 +76,8 @@ CREATE TABLE `apt_datasets` (
   `type` enum('stdataset','ltdataset','unknown') NOT NULL default 'unknown',
   `fstype` varchar(40) NOT NULL default 'none',
   `size` int(10) unsigned NOT NULL default '0',
+  `public` tinyint(1) NOT NULL default '0',
+  `shared` tinyint(1) NOT NULL default '0',
   `locked` datetime default NULL, 
   `locker_pid` int(11) default '0',
   PRIMARY KEY (`idx`),

sql/updates/4/414

+#
+# Modify datasets table.
+#
+use strict;
+use libdb;
+
+sub DoUpdate($$$)
+{
+    my ($dbhandle, $dbname, $version) = @_;
+
+    if (!DBSlotExists("apt_datasets", "public")) {
+	DBQueryFatal("alter table apt_datasets add ".
+		     " `public` tinyint(1) NOT NULL default '0' ".
+		     "  after size");
+    }
+    if (!DBSlotExists("apt_datasets", "shared")) {
+	DBQueryFatal("alter table apt_datasets add ".
+		     " `shared` tinyint(1) NOT NULL default '0' ".
+		     "  after public");
+    }
+    return 0;
+}
+
+# Local Variables:
+# mode:perl
+# End: