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';" ); }