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

[Hartmut Holzgraefe]

let mysql_upgrade take care of upper case host names (bug #1002402)

[Michael Widenius (monty)]

Hi!

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

Hartmut> Hartmut Holzgraefe has proposed merging lp:~hartmut-php/maria/bug1002404 into lp:maria.
Hartmut> Requested reviews:
Hartmut> Maria-captains (maria-captains)
Hartmut> Related bugs:
Hartmut> Bug #1002404 in Maria: "DROP USER can't drop users with legacy upper case host name anymore"
Hartmut> https://bugs.launchpad.net/maria/+bug/1002404

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

Hartmut> let mysql_upgrade take care of upper case host names (bug #1002402)
Hartmut> --
Hartmut> https://code.launchpad.net/~hartmut-php/maria/bug1002404/+merge/106785
Hartmut> Your team Maria-captains is requested to review the proposed merge of lp:~hartmut-php/maria/bug1002404 into lp:maria.

Thanks, will apply this to MariaDB 5.3 tomorrow.

Regards,
Monty

Unmerged revisions

3368. By Hartmut Holzgraefe on 2012-05-22

let mysql_upgrade take care of legacy host name entries with upper case
letters in mysql.* privilege tables (launchpad bug #1002404)

3367. By Sergei Golubchik on 2012-04-10

tweak the test to pass, until the upstream bug#61209 is *completely* fixed
(see my comments starting from [9 Apr 22:18])

3366. By Sergei Golubchik on 2012-04-10

mysql 5.5.23 merge

3365. By Sergei Golubchik on 2012-04-07

merge

3364. By Sergei Golubchik on 2012-04-05

mdev-208 thread pool breaks the server on XP

3363. By Kristian Nielsen on 2012-04-03

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 on 2012-04-03

Merge with 5.3

3361. By Michael Widenius on 2012-04-03

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

3360. By Sergei Golubchik on 2012-04-02

merge

3359. By Michael Widenius on 2012-04-02

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

=== modified file 'scripts/mysql_system_tables_fix.sql'
--- scripts/mysql_system_tables_fix.sql	2012-01-13 14:50:02 +0000
+++ scripts/mysql_system_tables_fix.sql	2012-05-22 11:36:21 +0000
@@ -228,6 +228,17 @@
   MODIFY type enum ('function','aggregate') COLLATE utf8_general_ci NOT NULL;
 
 #
+# host name handling changed to "always lower case" in 5.1.53
+#
+UPDATE columns_priv SET Host = LOWER(Host);
+UPDATE db           SET Host = LOWER(Host);
+UPDATE host         SET Host = LOWER(Host);
+UPDATE procs_priv   SET Host = LOWER(Host);
+UPDATE servers      SET Host = LOWER(Host);
+UPDATE tables_priv  SET Host = LOWER(Host);
+UPDATE user         SET Host = LOWER(Host);
+
+#
 # Modify log tables.
 #