[Koha-cvs] CVS: koha database.mysql,1.7,1.8

[Paul POULAIN]

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv19889

Modified Files:
        database.mysql 
Log Message:
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
> 




Index: database.mysql
===================================================================
RCS file: /cvsroot/koha/koha/database.mysql,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** database.mysql      12 May 2002 15:37:53 -0000      1.7
--- database.mysql      21 Jun 2002 08:55:50 -0000      1.8
***************
*** 419,422 ****
--- 419,423 ----
    unititle text,
    notes text,
+   abstract text,
    serial tinyint(1),
    seriestitle text,
***************
*** 543,546 ****
--- 544,557 ----
  
  #
+ # 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'
  #
***************
*** 787,790 ****
--- 798,802 ----
    variable char(50) DEFAULT '' NOT NULL,
    value char(200),
+   explanation char(200) default '',
    PRIMARY KEY (variable)
  );
***************
*** 812,813 ****
--- 824,840 ----
    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
+ );