@@ -, +, @@ --------- -- libraries may need to be sudo apt-get install'd in order to get it to run. fixed. --- C4/Installer.pm | 1 + installer/data/mysql/kohastructure.sql | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) --- a/C4/Installer.pm +++ a/C4/Installer.pm @@ -465,6 +465,7 @@ sub load_sql { warn "C4::Installer::load_sql returned the following errors while attempting to load $filename:\n"; warn "$error"; } + $error =~ s/mysql: \[Warning\] Using a password on the command line interface can be insecure\.\n//g; return $error; } --- a/installer/data/mysql/kohastructure.sql +++ a/installer/data/mysql/kohastructure.sql @@ -1391,7 +1391,7 @@ CREATE TABLE `letter` ( -- table for all notice templates in Koha `title` varchar(200) NOT NULL default '', -- subject line of the notice `content` text, -- body text for the notice or slip `message_transport_type` varchar(20) NOT NULL DEFAULT 'email', -- transport type for this notice - PRIMARY KEY (`module`,`code`, `branchcode`, `message_transport_type`), + UNIQUE KEY (`module`,`code`, `branchcode`, `message_transport_type`), CONSTRAINT `message_transport_type_fk` FOREIGN KEY (`message_transport_type`) REFERENCES `message_transport_types` (`message_transport_type`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -2499,7 +2499,7 @@ CREATE TABLE `permissions` ( `module_bit` int(11) NOT NULL DEFAULT 0, `code` varchar(64) DEFAULT NULL, `description` varchar(255) DEFAULT NULL, - PRIMARY KEY (`module_bit`, `code`), + UNIQUE KEY (`module_bit`, `code`), CONSTRAINT `permissions_ibfk_1` FOREIGN KEY (`module_bit`) REFERENCES `userflags` (`bit`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; --