Merge lp:~hartmut-php/maria/bug1002402 into lp:~maria-captains/maria/trunk

Proposed by Hartmut Holzgraefe
Status: Needs review
Proposed branch: lp:~hartmut-php/maria/bug1002402
Merge into: lp:~maria-captains/maria/trunk
Diff against target: 27 lines (+3/-4)
1 file modified
scripts/mysql_system_tables_data.sql (+3/-4)
To merge this branch: bzr merge lp:~hartmut-php/maria/bug1002402
Reviewer Review Type Date Requested Status
Maria-captains Pending
Review via email: mp+106688@code.launchpad.net

Description of the change

Make sure mysql_install_db stores host names in lower case form

To post a comment you must log in.
Revision history for this message
Michael Widenius (monty) wrote :

Hi!

>>>>> "Hartmut" == Hartmut Holzgraefe <email address hidden> writes:

Hartmut> Hartmut Holzgraefe has proposed merging lp:~hartmut-php/maria/bug1002402 into lp:maria.
Hartmut> Requested reviews:
Hartmut> Maria-captains (maria-captains)
Hartmut> Related bugs:
Hartmut> Bug #1002402 in Maria: "mysql_install_db still creates users with case sensitive hostname"
Hartmut> https://bugs.launchpad.net/maria/+bug/1002402

Hartmut> For more details, see:
Hartmut> https://code.launchpad.net/~hartmut-php/maria/bug1002402/+merge/106688

Hartmut> Make sure mysql_install_db stores host names in lower case form
Hartmut> --
Hartmut> https://code.launchpad.net/~hartmut-php/maria/bug1002402/+merge/106688
Hartmut> Your team Maria-captains is requested to review the proposed merge of lp:~hartmut-php/maria/bug1002402 into lp:maria.

Looks good.

I will add this today/tomorrow into 5.3.

Regards,
Monty

Unmerged revisions

3365. By Hartmut Holzgraefe

mysql_install_db needs to store lower cased hosed name (lp bug #1002402)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/mysql_system_tables_data.sql'
2--- scripts/mysql_system_tables_data.sql 2012-01-13 14:50:02 +0000
3+++ scripts/mysql_system_tables_data.sql 2012-05-21 18:45:26 +0000
4@@ -21,7 +21,7 @@
5 -- When setting up a "cross bootstrap" database (e.g., creating data on a Unix
6 -- host which will later be included in a Windows zip file), any lines
7 -- containing "@current_hostname" are filtered out by mysql_install_db.
8-set @current_hostname= @@hostname;
9+set @current_hostname= LOWER( @@hostname );
10
11
12 -- Fill "db" table with default grants for anyone to
13@@ -36,13 +36,12 @@
14 -- Fill "users" table with default users allowing root access
15 -- from local machine if "users" table didn't exist before
16 CREATE TEMPORARY TABLE tmp_user LIKE user;
17-set @current_hostname= @@hostname;
18 INSERT INTO tmp_user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','');
19-REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','' FROM dual WHERE LOWER( @current_hostname) != 'localhost';
20+REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','' FROM dual WHERE @current_hostname != 'localhost';
21 REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','');
22 REPLACE INTO tmp_user VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','');
23 INSERT INTO tmp_user (host,user) VALUES ('localhost','');
24-INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE LOWER(@current_hostname ) != 'localhost';
25+INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE @current_hostname != 'localhost';
26 INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
27 DROP TABLE tmp_user;
28

Subscribers

People subscribed via source and target branches