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

(-)a/C4/Installer.pm (+1 lines)
Lines 465-470 sub load_sql { Link Here
465
      warn "C4::Installer::load_sql returned the following errors while attempting to load $filename:\n";
465
      warn "C4::Installer::load_sql returned the following errors while attempting to load $filename:\n";
466
      warn "$error";
466
      warn "$error";
467
    }
467
    }
468
    $error =~ s/mysql: \[Warning\] Using a password on the command line interface can be insecure\.\n//g;
468
    return $error;
469
    return $error;
469
}
470
}
470
471
(-)a/installer/data/mysql/kohastructure.sql (-3 / +2 lines)
Lines 1391-1397 DROP TABLE IF EXISTS `letter`; Link Here
1391
CREATE TABLE `letter` ( -- table for all notice templates in Koha
1391
CREATE TABLE `letter` ( -- table for all notice templates in Koha
1392
  `module` varchar(20) NOT NULL default '', -- Koha module that triggers this notice or slip
1392
  `module` varchar(20) NOT NULL default '', -- Koha module that triggers this notice or slip
1393
  `code` varchar(20) NOT NULL default '', -- unique identifier for this notice or slip
1393
  `code` varchar(20) NOT NULL default '', -- unique identifier for this notice or slip
1394
  `branchcode` varchar(10) default NULL, -- the branch this notice or slip is used at (branches.branchcode)
1394
  `branchcode` varchar(10) NOT NULL default '', -- the branch this notice or slip is used at (branches.branchcode)
1395
  `name` varchar(100) NOT NULL default '', -- plain text name for this notice or slip
1395
  `name` varchar(100) NOT NULL default '', -- plain text name for this notice or slip
1396
  `is_html` tinyint(1) default 0, -- does this notice or slip use HTML (1 for yes, 0 for no)
1396
  `is_html` tinyint(1) default 0, -- does this notice or slip use HTML (1 for yes, 0 for no)
1397
  `title` varchar(200) NOT NULL default '', -- subject line of the notice
1397
  `title` varchar(200) NOT NULL default '', -- subject line of the notice
Lines 2494-2500 CREATE TABLE language_script_mapping ( Link Here
2494
DROP TABLE IF EXISTS `permissions`;
2494
DROP TABLE IF EXISTS `permissions`;
2495
CREATE TABLE `permissions` (
2495
CREATE TABLE `permissions` (
2496
  `module_bit` int(11) NOT NULL DEFAULT 0,
2496
  `module_bit` int(11) NOT NULL DEFAULT 0,
2497
  `code` varchar(64) DEFAULT NULL,
2497
  `code` varchar(64) NOT NULL DEFAULT '',
2498
  `description` varchar(255) DEFAULT NULL,
2498
  `description` varchar(255) DEFAULT NULL,
2499
  PRIMARY KEY  (`module_bit`, `code`),
2499
  PRIMARY KEY  (`module_bit`, `code`),
2500
  CONSTRAINT `permissions_ibfk_1` FOREIGN KEY (`module_bit`) REFERENCES `userflags` (`bit`)
2500
  CONSTRAINT `permissions_ibfk_1` FOREIGN KEY (`module_bit`) REFERENCES `userflags` (`bit`)
2501
- 

Return to bug 17234