From a3c976cb3ae928cd46243051200114e3a26063ed Mon Sep 17 00:00:00 2001 From: Bernardo Gonzalez Kriegel Date: Thu, 19 Nov 2015 18:49:53 -0300 Subject: [PATCH] Bug 15207: (followup) add collate info to sound alerts table Only missing bit is some collate info in sound alerts table. To test: 1) With previous patch applied, do an upgrade (3.20 -> 3.22) 2) Dump database structure (mysqldump -d) save 3) Do a clean install (3.22), dump db structure, compare (diff) Note collate info missing in sound alerts table 4) With patch applied do again an upgrade, dump db struct, compare again Now sound alerts table have collate info Don't know if this is relevant. --- installer/data/mysql/updatedatabase.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 52307d3..b4c525c 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -11286,11 +11286,11 @@ if ( CheckVersion($DBversion) ) { CREATE TABLE audio_alerts ( id int(11) NOT NULL AUTO_INCREMENT, precedence smallint(5) unsigned NOT NULL, - selector varchar(255) NOT NULL, - sound varchar(255) NOT NULL, + selector varchar(255) COLLATE utf8_unicode_ci NOT NULL, + sound varchar(255) COLLATE utf8_unicode_ci NOT NULL, PRIMARY KEY (id), KEY precedence (precedence) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8; + ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; }); $dbh->do(q{ -- 1.9.1