components/database/percona-server-56/patches/06-my.cnf-serch-path.patch

   1 We leave configs in /etc/mysql only for humans.
   2 As /etc/mysql/my.cnf is mediated and can point to
   3 another DBMS's config, we don't read it.
   4 We also skip /etc/my.cnf as we are not sure that it's
   5 our own config. So, we use only $(CONFDIR)/my.cnf
   6
   7 --- percona-server-5.6.31-77.0/mysys_ssl/my_default.cc.~1~ 2016-06-30 13:04:53.000000000 +0300
   8 +++ percona-server-5.6.31-77.0/mysys_ssl/my_default.cc  2016-07-27 15:39:27.231412249 +0300
   9 @@ -1394,12 +1394,12 @@
  10
  11  #else
  12
  13 -  errors += add_directory(alloc, "/etc/", dirs);
  14 -  errors += add_directory(alloc, "/etc/mysql/", dirs);
  15 -
  16  #if defined(DEFAULT_SYSCONFDIR)
  17    if (DEFAULT_SYSCONFDIR[0])
  18      errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
  19 +#else
  20 +  errors += add_directory(alloc, "/etc/", dirs);
  21 +  errors += add_directory(alloc, "/etc/mysql/", dirs);
  22  #endif /* DEFAULT_SYSCONFDIR */
  23
  24  #endif