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

(-)a/C4/Installer.pm (+1 lines)
Lines 462-467 sub load_sql { Link Here
462
      warn "C4::Installer::load_sql returned the following errors while attempting to load $filename:\n";
462
      warn "C4::Installer::load_sql returned the following errors while attempting to load $filename:\n";
463
      warn "$error";
463
      warn "$error";
464
    }
464
    }
465
    $error =~ s/mysql: \[Warning\] Using a password on the command line interface can be insecure\.\n//g;
465
    return $error;
466
    return $error;
466
}
467
}
467
468
(-)a/installer/data/mysql/kohastructure.sql (-3 / +2 lines)
Lines 1343-1349 DROP TABLE IF EXISTS `letter`; Link Here
1343
CREATE TABLE `letter` ( -- table for all notice templates in Koha
1343
CREATE TABLE `letter` ( -- table for all notice templates in Koha
1344
  `module` varchar(20) NOT NULL default '', -- Koha module that triggers this notice or slip
1344
  `module` varchar(20) NOT NULL default '', -- Koha module that triggers this notice or slip
1345
  `code` varchar(20) NOT NULL default '', -- unique identifier for this notice or slip
1345
  `code` varchar(20) NOT NULL default '', -- unique identifier for this notice or slip
1346
  `branchcode` varchar(10) default NULL, -- the branch this notice or slip is used at (branches.branchcode)
1346
  `branchcode` varchar(10) NOT NULL default '', -- the branch this notice or slip is used at (branches.branchcode)
1347
  `name` varchar(100) NOT NULL default '', -- plain text name for this notice or slip
1347
  `name` varchar(100) NOT NULL default '', -- plain text name for this notice or slip
1348
  `is_html` tinyint(1) default 0, -- does this notice or slip use HTML (1 for yes, 0 for no)
1348
  `is_html` tinyint(1) default 0, -- does this notice or slip use HTML (1 for yes, 0 for no)
1349
  `title` varchar(200) NOT NULL default '', -- subject line of the notice
1349
  `title` varchar(200) NOT NULL default '', -- subject line of the notice
Lines 2445-2451 CREATE TABLE language_script_mapping ( Link Here
2445
DROP TABLE IF EXISTS `permissions`;
2445
DROP TABLE IF EXISTS `permissions`;
2446
CREATE TABLE `permissions` (
2446
CREATE TABLE `permissions` (
2447
  `module_bit` int(11) NOT NULL DEFAULT 0,
2447
  `module_bit` int(11) NOT NULL DEFAULT 0,
2448
  `code` varchar(64) DEFAULT NULL,
2448
  `code` varchar(64) NOT NULL DEFAULT '',
2449
  `description` varchar(255) DEFAULT NULL,
2449
  `description` varchar(255) DEFAULT NULL,
2450
  PRIMARY KEY  (`module_bit`, `code`),
2450
  PRIMARY KEY  (`module_bit`, `code`),
2451
  CONSTRAINT `permissions_ibfk_1` FOREIGN KEY (`module_bit`) REFERENCES `userflags` (`bit`)
2451
  CONSTRAINT `permissions_ibfk_1` FOREIGN KEY (`module_bit`) REFERENCES `userflags` (`bit`)
2452
- 

Return to bug 17320