View | Details | Raw Unified | Return to bug 17234
Collapse All | Expand All

(-)a/C4/Installer.pm (+6 lines)
Lines 569-574 sub load_sql { Link Here
569
        # so that only true errors are returned to stderr or else the installer will 
569
        # so that only true errors are returned to stderr or else the installer will 
570
        # report the import a failure although it really succeded -fbcit
570
        # report the import a failure although it really succeded -fbcit
571
    }
571
    }
572
#   errors thrown while loading installer data should be logged
573
    if($error) {
574
      warn "C4::Installer::load_sql returned the following errors while attempting to load $filename:\n";
575
      warn "$error";
576
    }
577
    $error =~ s/mysql: \[Warning\] Using a password on the command line interface can be insecure\.\n//g;
572
    return $error;
578
    return $error;
573
}
579
}
574
580
(-)a/installer/data/mysql/kohastructure.sql (-2 / +1 lines)
Lines 2126-2132 CREATE TABLE language_script_mapping ( Link Here
2126
DROP TABLE IF EXISTS `permissions`;
2126
DROP TABLE IF EXISTS `permissions`;
2127
CREATE TABLE `permissions` (
2127
CREATE TABLE `permissions` (
2128
  `module_bit` int(11) NOT NULL DEFAULT 0,
2128
  `module_bit` int(11) NOT NULL DEFAULT 0,
2129
  `code` varchar(30) DEFAULT NULL,
2129
  `code` varchar(64) NOT NULL DEFAULT '',
2130
  `description` varchar(255) DEFAULT NULL,
2130
  `description` varchar(255) DEFAULT NULL,
2131
  PRIMARY KEY  (`module_bit`, `code`),
2131
  PRIMARY KEY  (`module_bit`, `code`),
2132
  CONSTRAINT `permissions_ibfk_1` FOREIGN KEY (`module_bit`) REFERENCES `userflags` (`bit`)
2132
  CONSTRAINT `permissions_ibfk_1` FOREIGN KEY (`module_bit`) REFERENCES `userflags` (`bit`)
2133
- 

Return to bug 17234