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)

3364. By Sergei Golubchik

mdev-208 thread pool breaks the server on XP

3363. By Kristian Nielsen

lp:886550 Wrong installation path for some include files.

Now install all includes in a flat hierarchy under
$PREFIX/include/mysq/, same as 5.3. User can override with
-DINSTALL_INCLUDEDIR

3362. By Michael Widenius

Merge with 5.3

3361. By Michael Widenius

Define dummy my_init_stacktrace() to allow one to call it without #ifdef HAVE_STACKTRACE
Fixed compilation problem on windows.

3360. By Sergei Golubchik

merge

3359. By Michael Widenius

Merge of compatibility fixes
Fixed failing tests in sys_vars as we have now stricter checking of setting of variables.

3358. By Michael Widenius

automatic merge

3357. By Sergei Golubchik

1. support for testing statically built oqgraph
2. my_new.cc should redefine new (std:nothrow) too.

3356. By Kristian Nielsen

Fix race in rpl.rpl_checksum.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'scripts/mysql_system_tables_data.sql'
--- scripts/mysql_system_tables_data.sql 2012-01-13 14:50:02 +0000
+++ scripts/mysql_system_tables_data.sql 2012-05-21 18:45:26 +0000
@@ -21,7 +21,7 @@
21-- When setting up a "cross bootstrap" database (e.g., creating data on a Unix21-- When setting up a "cross bootstrap" database (e.g., creating data on a Unix
22-- host which will later be included in a Windows zip file), any lines22-- host which will later be included in a Windows zip file), any lines
23-- containing "@current_hostname" are filtered out by mysql_install_db.23-- containing "@current_hostname" are filtered out by mysql_install_db.
24set @current_hostname= @@hostname;24set @current_hostname= LOWER( @@hostname );
2525
2626
27-- Fill "db" table with default grants for anyone to27-- Fill "db" table with default grants for anyone to
@@ -36,13 +36,12 @@
36-- Fill "users" table with default users allowing root access36-- Fill "users" table with default users allowing root access
37-- from local machine if "users" table didn't exist before37-- from local machine if "users" table didn't exist before
38CREATE TEMPORARY TABLE tmp_user LIKE user;38CREATE TEMPORARY TABLE tmp_user LIKE user;
39set @current_hostname= @@hostname;
40INSERT 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,'','');39INSERT 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,'','');
41REPLACE 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';40REPLACE 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';
42REPLACE 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,'','');41REPLACE 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,'','');
43REPLACE 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,'','');42REPLACE 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,'','');
44INSERT INTO tmp_user (host,user) VALUES ('localhost','');43INSERT INTO tmp_user (host,user) VALUES ('localhost','');
45INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE LOWER(@current_hostname ) != 'localhost';44INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE @current_hostname != 'localhost';
46INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;45INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
47DROP TABLE tmp_user;46DROP TABLE tmp_user;
4847

Subscribers

People subscribed via source and target branches