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 CREATE TABLE `letter` ( -- table for all notice templates in Koha Link Here
1391
  `title` varchar(200) NOT NULL default '', -- subject line of the notice
1391
  `title` varchar(200) NOT NULL default '', -- subject line of the notice
1392
  `content` text, -- body text for the notice or slip
1392
  `content` text, -- body text for the notice or slip
1393
  `message_transport_type` varchar(20) NOT NULL DEFAULT 'email', -- transport type for this notice
1393
  `message_transport_type` varchar(20) NOT NULL DEFAULT 'email', -- transport type for this notice
1394
  PRIMARY KEY  (`module`,`code`, `branchcode`, `message_transport_type`),
1394
  UNIQUE KEY  (`module`,`code`, `branchcode`, `message_transport_type`),
1395
  CONSTRAINT `message_transport_type_fk` FOREIGN KEY (`message_transport_type`)
1395
  CONSTRAINT `message_transport_type_fk` FOREIGN KEY (`message_transport_type`)
1396
  REFERENCES `message_transport_types` (`message_transport_type`) ON DELETE CASCADE ON UPDATE CASCADE
1396
  REFERENCES `message_transport_types` (`message_transport_type`) ON DELETE CASCADE ON UPDATE CASCADE
1397
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
1397
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
Lines 2499-2505 CREATE TABLE `permissions` ( Link Here
2499
  `module_bit` int(11) NOT NULL DEFAULT 0,
2499
  `module_bit` int(11) NOT NULL DEFAULT 0,
2500
  `code` varchar(64) DEFAULT NULL,
2500
  `code` varchar(64) DEFAULT NULL,
2501
  `description` varchar(255) DEFAULT NULL,
2501
  `description` varchar(255) DEFAULT NULL,
2502
  PRIMARY KEY  (`module_bit`, `code`),
2502
  UNIQUE KEY  (`module_bit`, `code`),
2503
  CONSTRAINT `permissions_ibfk_1` FOREIGN KEY (`module_bit`) REFERENCES `userflags` (`bit`)
2503
  CONSTRAINT `permissions_ibfk_1` FOREIGN KEY (`module_bit`) REFERENCES `userflags` (`bit`)
2504
    ON DELETE CASCADE ON UPDATE CASCADE
2504
    ON DELETE CASCADE ON UPDATE CASCADE
2505
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
2505
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
2506
- 

Return to bug 17234