diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2020-03-05 10:52:43 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2020-03-05 10:52:43 +0200 |
| commit | da10c6f448f826c5fbd904bd80de5630cf2eb0c3 (patch) | |
| tree | adfd9522d693c43fff8eb42995a37e8fddc05268 /support-files | |
| parent | f0d2542a37ccd0509ab37ebaa7661604f00db80d (diff) | |
| parent | 395f23a10d44a63732dd69f79fb7372bc5834443 (diff) | |
| download | mariadb-git-da10c6f448f826c5fbd904bd80de5630cf2eb0c3.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mariadb.pc.in | 2 | ||||
| -rw-r--r-- | support-files/mariadb.service.in | 2 | ||||
| -rw-r--r-- | support-files/mariadb@.service.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/support-files/mariadb.pc.in b/support-files/mariadb.pc.in index bc84a5c5c4c..7d321f28491 100644 --- a/support-files/mariadb.pc.in +++ b/support-files/mariadb.pc.in @@ -20,4 +20,4 @@ Description: @CPACK_PACKAGE_DESCRIPTION_SUMMARY@ URL: @CPACK_PACKAGE_URL@ Version: @VERSION@ Libs: -L${libdir} @LIBS_FOR_CLIENTS@ -Cflags: -I${includedir} -I${includedir}/.. @CFLAGS_FOR_CLIENTS@ +Cflags: -I${includedir} @CFLAGS_FOR_CLIENTS@ diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in index 1fc2527322c..49d7c3efb74 100644 --- a/support-files/mariadb.service.in +++ b/support-files/mariadb.service.in @@ -141,7 +141,7 @@ TimeoutStopSec=900 ## isn't executed. ## -# Number of files limit. previously [mysqld_safe] open-file-limit +# Number of files limit. previously [mysqld_safe] open-files-limit LimitNOFILE=16364 # Maximium core size. previously [mysqld_safe] core-file-size diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in index 15d640a2c7e..184298dab47 100644 --- a/support-files/mariadb@.service.in +++ b/support-files/mariadb@.service.in @@ -167,7 +167,7 @@ TimeoutStopSec=900 ## isn't executed. ## -# Number of files limit. previously [mysqld_safe] open-file-limit +# Number of files limit. previously [mysqld_safe] open-files-limit LimitNOFILE=16364 # Maximium core size. previously [mysqld_safe] core-file-size |