From: Nicole Engard <nengard@gmail.com>
Date: Tue, 2 Feb 2010 07:58:30 +0000 (-0500)
Subject: remove mysql5.0 errors in patroncard upgrade
X-Git-Tag: v3.02.00-alpha2~525
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;ds=sidebyside;h=04935441102fb3252c9427634ad96eeac3c76188;p=koha_fer

remove mysql5.0 errors in patroncard upgrade

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
---

diff --git a/installer/data/mysql/patroncards_upgrade.pl b/installer/data/mysql/patroncards_upgrade.pl
index 9306b4d708..d20d24a673 100644
--- a/installer/data/mysql/patroncards_upgrade.pl
+++ b/installer/data/mysql/patroncards_upgrade.pl
@@ -44,7 +44,7 @@ $sth->do("
       `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
       `branch_code` varchar(10) NOT NULL DEFAULT 'NB',
       `creator` char(15) NOT NULL DEFAULT 'Labels',
-      PRIMARY KEY (`label_id`) USING BTREE,
+      PRIMARY KEY (`label_id`),
       KEY `branch_fk_constraint` (`branch_code`),
       KEY `item_fk_constraint` (`item_number`),
       KEY `borrower_fk_constraint` (`borrower_number`),
@@ -72,7 +72,7 @@ $sth->do("
       `format_string` varchar(210) NOT NULL DEFAULT 'barcode',
       `layout_xml` text NOT NULL,
       `creator` char(15) NOT NULL DEFAULT 'Labels',
-      PRIMARY KEY (`layout_id`) USING BTREE
+      PRIMARY KEY (`layout_id`)
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 ") or die "DB ERROR: " . $sth->errstr . "\n";
 
@@ -110,7 +110,7 @@ CREATE TABLE `creator_images` (
       `image_id` int(4) NOT NULL AUTO_INCREMENT,
       `imagefile` mediumblob,
       `image_name` char(20) NOT NULL DEFAULT 'DEFAULT',
-      PRIMARY KEY (`image_id`) USING BTREE,
+      PRIMARY KEY (`image_id`),
       UNIQUE KEY `image_name_index` (`image_name`)
     ) ENGINE=InnoDB AUTO_INCREMENT=47 DEFAULT CHARSET=utf8;
 ") or die "DB ERROR: " . $sth->errstr . "\n";
@@ -124,7 +124,7 @@ $sth->do("
 ") or die "DB ERROR: " . $sth->errstr . "\n";
 
 $sth->do("
-    ALTER TABLE printers_profile ADD UNIQUE KEY `printername` (`printer_name`,`template_id`,`paper_bin`,`creator`) USING BTREE;
+    ALTER TABLE printers_profile ADD UNIQUE KEY `printername` (`printer_name`,`template_id`,`paper_bin`,`creator`);
 ") or die "DB ERROR: " . $sth->errstr . "\n";
 
 # Migrate data from existing tables to new tables...