From 1edd99e6fa03048b83edccef81e7a6fa226f2ac1 Mon Sep 17 00:00:00 2001 From: Koustubha Kale Date: Fri, 19 Mar 2010 12:56:06 +0530 Subject: [PATCH] Changes to kohastructure.sql to add some missing drop if exists + change in install.pl mysql show tables [RM note: bug 4323] Signed-off-by: Galen Charlton --- installer/data/mysql/kohastructure.sql | 4 ++-- installer/install.pl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 21baf27a6d..db5b372d89 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -466,7 +466,7 @@ CREATE TABLE `default_branch_circ_rules` ( -- -- Table structure for table `default_branch_item_rules` -- - +DROP TABLE IF EXISTS `default_branch_item_rules`; CREATE TABLE `default_branch_item_rules` ( `itemtype` varchar(10) NOT NULL, `holdallowed` tinyint(1) default NULL, @@ -2222,7 +2222,7 @@ CREATE TABLE `item_circulation_alert_preferences` ( -- -- Table structure for table `messages` -- - +DROP TABLE IF EXISTS `messages`; CREATE TABLE `messages` ( `message_id` int(11) NOT NULL auto_increment, `borrowernumber` int(11) NOT NULL, diff --git a/installer/install.pl b/installer/install.pl index 9d152dd98d..80df97f49a 100755 --- a/installer/install.pl +++ b/installer/install.pl @@ -433,7 +433,7 @@ elsif ( $step && $step == 3 ) { $info{'user'}, $info{'password'} ); my $rq; - if ( $info{dbms} eq 'mysql' ) { $rq = $dbh->prepare( "SHOW TABLES FROM " . $info{'dbname'} ); } + if ( $info{dbms} eq 'mysql' ) { $rq = $dbh->prepare( "SHOW TABLES" ); } elsif ( $info{dbms} eq 'Pg' ) { $rq = $dbh->prepare( "SELECT * FROM information_schema.tables WHERE table_schema='public' and table_type='BASE TABLE';" ); } -- 2.39.5