MySQL (incompatible change): handle !include directives in the middle of sections

[lutter]

MySQL (incompatible change): handle !include directives in the middle…

CentOS 6.6 (at least) ships with a mysql.conf that has a !include directive
in the middle of a section. To accomodate that, we pull !include directives
into the sections in which they appear rather than having htem end the
section. That's the incompatible change: these directives now appear
underneath /target/!include rather than at /!include

Fixes #113

[raphink]

Is that really necessary though?

[lutter]

I can't come up with another way to allow this sort of format. Would love to see a backwards compatible fix. Do you have any ideas on how ?

[raphink]

I'll have a look

[raphink]

I don't really get the issue. If I add !include statements in the middle of the file, they get parsed OK:

diff --git a/lenses/tests/test_mysql.aug b/lenses/tests/test_mysql.aug
index 9356204..8fe752f 100644
--- a/lenses/tests/test_mysql.aug
+++ b/lenses/tests/test_mysql.aug
@@ -110,6 +110,9 @@ quick
 quote-names
 max_allowed_packet     = 16M

+!includedir /etc/mysql/middle_include
+!include /etc/mysql/middle_include.conf
+
 [mysql]
 #no-auto-rehash        # faster start of mysql but no tab completition

$ augparsediff -c -I lenses/ lenses/tests/test_mysql.aug 
Syntax error in lens definition
Failed to load lenses/tests/test_mysql.aug
--- expected    2015-06-12 11:25:32.982707547 +0200
+++ actual  2015-06-12 11:25:32.986707733 +0200
@@ -113,6 +113,9 @@
     { "max_allowed_packet" = "16M" }
     {  }
   }
+  { "!includedir" = "/etc/mysql/middle_include" }
+  { "!include" = "/etc/mysql/middle_include.conf" }
+  {  }
   { "target" = "mysql"
     { "#comment" = "no-auto-rehash # faster start of mysql but no tab completition" }
     {  }

[raphink]

Ah sorry @lutter, @domcleal just explained to me what you meant… I see the issue now…

I guess there would be an option of allowing include statements inside sections but not at the end of the section, but that wouldn't be very intuitive. So if that's not an option, your fix is the only way.

[raphink]

@lutter should we merge this then?