From 4d40d7af28f38ab0c18fa6820c5887b89e06ad62 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Fri, 21 Jun 2002 08:55:50 +0000
Subject: [PATCH] MERGE 1.2 and main branches Still a few diffs i don't
 understand :

311,320c311,312
<   categoryname text,
<   codedescription text,
<   PRIMARY KEY (categorycode)
< );
<
< # Table structure for table 'branchrelations'
< #
< CREATE TABLE branchrelations (
<   branchcode varchar(4) DEFAULT '' NOT NULL,
<   categorycode varchar(4) DEFAULT '' NOT NULL
---
>   branchcode char(4) DEFAULT '' NOT NULL,
>   branchholding int(11)
344c336
<   datesent datetime DEFAULT '0000-00-00' NOT NULL,
---
>   datesent date DEFAULT '0000-00-00' NOT NULL,
346c338
<   datearrived datetime,
---
>   datearrived date,
553a546
>
---
 database.mysql | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/database.mysql b/database.mysql
index 4d9890d377..773d09ec8a 100644
--- a/database.mysql
+++ b/database.mysql
@@ -418,6 +418,7 @@ CREATE TABLE deletedbiblio (
   title text,
   unititle text,
   notes text,
+  abstract text,
   serial tinyint(1),
   seriestitle text,
   copyrightdate smallint(6),
@@ -541,6 +542,16 @@ CREATE TABLE deleteditems (
   UNIQUE barcode (barcode)
 );
 
+#
+# Table structure for table 'ethnicity'
+#
+
+CREATE TABLE ethnicity (
+  code varchar(10) NOT NULL default '',
+  name varchar(255) default NULL,
+  PRIMARY KEY  (code)
+);      
+
 #
 # Table structure for table 'issues'
 #
@@ -786,6 +797,7 @@ CREATE TABLE stopwords (
 CREATE TABLE systempreferences (
   variable char(50) DEFAULT '' NOT NULL,
   value char(200),
+  explanation char(200) default '',
   PRIMARY KEY (variable)
 );
 
@@ -811,3 +823,18 @@ CREATE TABLE websites (
   url varchar(255),
   PRIMARY KEY (websitenumber)
 ) TYPE=ISAM PACK_KEYS=1;
+
+CREATE TABLE uploadedmarc (
+  id int(11) NOT NULL auto_increment,
+  marc longblob,
+  hidden smallint(6) default NULL,
+  name varchar(255) default NULL,
+  PRIMARY KEY  (id)
+);
+					
+
+CREATE TABLE marcrecorddone (
+  isbn char(40) default NULL,
+  issn char(40) default NULL,
+  lccn char(40) default NULL
+);
-- 
2.39.5