Bugzilla – Attachment 56821 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 v3.00.00 "install"
Bug-17234-DO-NOT-PUSH-Make-v30000-install.patch (text/plain), 1.75 KB, created by
Mark Tompsett
on 2016-10-25 01:17:48 UTC
(
hide
)
Description:
Bug 17234 [DO NOT PUSH] Make v3.00.00 "install"
Filename:
MIME Type:
Creator:
Mark Tompsett
Created:
2016-10-25 01:17:48 UTC
Size:
1.75 KB
patch
obsolete
>From 85dd052cfb93452c4f2f89e3787027483eadd3f7 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 v3.00.00 "install" > >Tweak fields, so primary key is workable. >Ignore command line mysql error security warning >--- > C4/Installer.pm | 6 ++++++ > installer/data/mysql/kohastructure.sql | 2 +- > 2 files changed, 7 insertions(+), 1 deletion(-) > >diff --git a/C4/Installer.pm b/C4/Installer.pm >index 1dc13aa..8ef1416 100644 >--- a/C4/Installer.pm >+++ b/C4/Installer.pm >@@ -569,6 +569,12 @@ sub load_sql { > # so that only true errors are returned to stderr or else the installer will > # report the import a failure although it really succeded -fbcit > } >+# errors thrown while loading installer data should be logged >+ if($error) { >+ 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 53da4fe..c6d041e 100644 >--- a/installer/data/mysql/kohastructure.sql >+++ b/installer/data/mysql/kohastructure.sql >@@ -2126,7 +2126,7 @@ CREATE TABLE language_script_mapping ( > DROP TABLE IF EXISTS `permissions`; > CREATE TABLE `permissions` ( > `module_bit` int(11) NOT NULL DEFAULT 0, >- `code` varchar(30) 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