[Koha-cvs] CVS: koha database.mysql,1.2.2.6,1.2.2.7

[Paul POULAIN]

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

Modified Files:
      Tag: rel-1-2
        database.mysql 
Log Message:
MERGE 1-2 and main branches
Still a few diffs : 
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.2.2.6
retrieving revision 1.2.2.7
diff -C2 -r1.2.2.6 -r1.2.2.7
*** database.mysql      15 Jun 2002 02:07:05 -0000      1.2.2.6
--- database.mysql      21 Jun 2002 08:56:46 -0000      1.2.2.7
***************
*** 805,808 ****
--- 805,820 ----
  );
  
+ #
+ # Table structure for table 'websites'
+ #
+ 
+ CREATE TABLE websites (
+   websitenumber int(11) NOT NULL auto_increment,
+   biblionumber int(11) NOT NULL default '0',
+   title text,
+   description text,
+   url varchar(255),
+   PRIMARY KEY (websitenumber)
+ ) TYPE=ISAM PACK_KEYS=1;
  
  CREATE TABLE uploadedmarc (