Bugzilla – Attachment 56820 Details for
Bug 17234
ALTER IGNORE TABLE is invalid in mysql 5.7. This breaks updatedatabase.pl
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17234 [DO NOT PUSH] Make 3.14.x "install"
Bug-17234-DO-NOT-PUSH-Make-314x-install.patch (text/plain), 2.26 KB, created by
Mark Tompsett
on 2016-10-25 01:09:14 UTC
(
hide
)
Description:
Bug 17234 [DO NOT PUSH] Make 3.14.x "install"
Filename:
MIME Type:
Creator:
Mark Tompsett
Created:
2016-10-25 01:09:14 UTC
Size:
2.26 KB
patch
obsolete
>From 9e290ffab22343488b0055b0f0a38c644851150a Mon Sep 17 00:00:00 2001 >From: Mark Tompsett <mtompset@hotmail.com> >Date: Mon, 24 Oct 2016 14:37:20 -0400 >Subject: [PATCH] Bug 17234 [DO NOT PUSH] Make 3.14.x "install" > >Tweak fields, so primary key is workable. >Ignore command line mysql error security warning >--- > C4/Installer.pm | 1 + > installer/data/mysql/kohastructure.sql | 4 ++-- > 2 files changed, 3 insertions(+), 2 deletions(-) > >diff --git a/C4/Installer.pm b/C4/Installer.pm >index d15be1f..1d205b7 100644 >--- a/C4/Installer.pm >+++ b/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; > } > >diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql >index 900b405..e76e18e 100644 >--- a/installer/data/mysql/kohastructure.sql >+++ b/installer/data/mysql/kohastructure.sql >@@ -1391,7 +1391,7 @@ DROP TABLE IF EXISTS `letter`; > CREATE TABLE `letter` ( -- table for all notice templates in Koha > `module` varchar(20) NOT NULL default '', -- Koha module that triggers this notice or slip > `code` varchar(20) NOT NULL default '', -- unique identifier for this notice or slip >- `branchcode` varchar(10) default NULL, -- the branch this notice or slip is used at (branches.branchcode) >+ `branchcode` varchar(10) NOT NULL default '', -- the branch this notice or slip is used at (branches.branchcode) > `name` varchar(100) NOT NULL default '', -- plain text name for this notice or slip > `is_html` tinyint(1) default 0, -- does this notice or slip use HTML (1 for yes, 0 for no) > `title` varchar(200) NOT NULL default '', -- subject line of the notice >@@ -2494,7 +2494,7 @@ CREATE TABLE language_script_mapping ( > DROP TABLE IF EXISTS `permissions`; > CREATE TABLE `permissions` ( > `module_bit` int(11) NOT NULL DEFAULT 0, >- `code` varchar(64) DEFAULT NULL, >+ `code` varchar(64) NOT NULL DEFAULT '', > `description` varchar(255) DEFAULT NULL, > PRIMARY KEY (`module_bit`, `code`), > CONSTRAINT `permissions_ibfk_1` FOREIGN KEY (`module_bit`) REFERENCES `userflags` (`bit`) >-- >2.7.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 17234
:
55113
|
55144
|
55634
|
55635
|
55704
|
55722
|
55729
|
55833
| 56820 |
56821
|
56822
|
56823
|
56824
|
56825
|
58548
|
58551
|
58552
|
58865
|
59003