database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-09-11 08:30:59 +03:00
Code Activity
2,131 Commits 92 Branches 94 Tags
3.3-merge
Commit Graph

67 Commits

Author SHA1 Message Date
Georg Richter
57ce0ce3c7 Merge branch '3.1' into 3.3 2025-01-15 08:00:19 +01:00
Dave Gosselin
8ba535160c CONC-750 unit.pfs_instr-oom fails on mac with dynamic-stack-overflow 
Write a NULL byte at end of the array used for reading the executable
name, not at one past the end of the array.
 2024-12-06 14:23:28 -05:00
Georg Richter
77d2585f98 Merge branch '3.2' into 3.3 2022-02-04 15:04:54 +01:00
Georg Richter
564ffc4bc6 Build fix: 
include alloca.h in mariadb_config.c.in
 2022-02-04 15:03:01 +01:00
Georg Richter
b5c1a23c82 Merge branch '3.2' into 3.3 2022-01-25 03:52:42 +01:00
Georg Richter
11005cb640 Merge pull request #138 from joostdekeijzer/mariadb_config-INSTALL_BINDIR 
Shouldn't INSTALL mariadb_config honour INSTALL_BINDIR?
 2022-01-23 21:17:22 +01:00
Georg Richter
493dce66ff Merge pull request #156 from devnexen/dflybsd_build_fix 
config binary path: dragonflybsd build little update
 2022-01-23 21:00:01 +01:00
Georg Richter
e19c93d31b MDEV-16383 Add mariadb_config --libmysqld-libs option 
If server package was built with embedded server and MariaDB
Connector/C was built as subproject in server package mariadb_config
will display link option for embedded server.
 2022-01-14 20:06:39 +01:00
David CARLIER
58d33ed3f8 config binary path: dragonflybsd build little update 2021-02-24 20:17:22 +00:00
Marko Mäkelä
62427520a5 CONC-513 MSAN use-of-uninitialized-value in strstr() 
mariadb_get_install_location(): Ensure that the string will be
terminated by a NUL byte, to avoid potential stack overrun
in strstr().

This regression was introduced in
commit 448514a1ad.
 2020-10-30 12:09:04 +02:00
Georg Richter
8a4fac7f22 unittest fix: 
Added macro SKIP_NOTLS for skipping tests if MariaDB Connector/C
was build without TLS support.
 2020-10-23 06:39:15 +02:00
Georg Richter
2064d89513 Followup of 7b4d5e785a 
Supress warning when passing emptry string to printf.
 2020-10-23 06:14:04 +02:00
Georg Richter
7b4d5e785a Build fix: 
Set TLS library version to empty string if MariaDB Connector/C
was configure with option -DWITH_SSL=OFF.
 2020-10-23 05:59:41 +02:00
Georg Richter
086f810ba4 Build fix for FreeBSD: 
Since CHECK_INCLUDE_FILES(sys/sysctl.h) fails on FreeBSD, and FreeBSD
doesn't support procfs by default, we need to check for platform (FreeBSD)
only.
 2020-09-16 07:44:05 +02:00
Georg Richter
0a97a81f8c Fix build 2020-09-14 13:22:17 +02:00
Georg Richter
448514a1ad Some rework on mariadb_config 
1) mariadb_config now tries to determine the path from which it was started, in following order:
- if environment variable MARIADB_CONFIG was set
- use system call(s) to determine the path
- if the previous mentioned attemps where unsuccessful, build option CMAKE_INSTALL_PREFIX will be used

2) Added support variables pkglibdir, pkgincludedir and pkgplugindr.

3) Adjusted server version for C/C standalone builds to 10.5.5
 2020-09-13 11:12:36 +02:00
Georg Richter
abe3b1dfb3 Bumped year in mariadb_config 2020-09-03 06:47:30 +02:00
Georg Richter
49be7b28b6 Merge pull request #124 from EGuesnet/AIX 
[CONC-430] Compilation on AIX
 2020-08-13 14:38:48 +02:00
joostdekeijzer
511e345d92 Shouldn't INSTALL mariadb_config honour INSTALL_BINDIR? 2020-06-05 11:38:39 +02:00
Daniel Black
a4c496f767 mariadb_config: solaris fix - types for options 
Solaris defines `struct option` as char * members.

We apply a cast as we don't change these values.
 2020-04-04 19:05:18 +11:00
Ryan Coe
15856fc960 add @CMAKE_SYSROOT@ to include and library paths 
When cross-compiling MariaDB, system paths are returned by the mysql-config
and mariadb-config tools. Add @CMAKE_SYSROOT@ to the paths to avoid this
issue.

Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
 2020-02-11 08:27:26 -08:00
EGuesnet
870540af9e getopt provided by a compatibility library on AIX 2020-01-23 11:33:32 +01:00
Georg Richter
b5bd0e5818 Merge commit '77d051e89d0b342333d951e66e53f2aea43f6e36' into 3.1 2019-07-16 17:33:00 +02:00
Georg Richter
2674447d75 Fix short options 2019-07-05 11:14:37 +02:00
Georg Richter
7406241ff0 Merge pull request #108 from nunojpg/3.1 
Quote cmake variable as it might be empty
 2019-07-05 08:25:21 +02:00
Georg Richter
3927466db5 Merge commit 'a0d2974bf29bf49fb8f9d1fd75fd2fa211df883d' into 3.1 2019-06-26 13:01:45 +02:00
Michal Schorm
cc5489fdad Fix overlinking issues 2019-05-21 15:02:48 +02:00
Nuno Goncalves
88a6d824e2 Quote cmake variable as it might be empty 
Signed-off-by: Nuno Goncalves <nunojpg@gmail.com>
 2019-04-08 07:46:29 +02:00
Georg Richter
255f3432a0 Fixed year in copyright notice 2019-03-05 05:56:12 +01:00
Sergei Golubchik
44b21bf642 install libmariadb.pc in the package-dependent location 2018-11-14 13:55:28 +01:00
Georg Richter
2a49494c09 Fixed pkg-config configuration (CONC-283) 2018-10-23 11:30:46 +02:00
luz.paz
b2e6ed0295 Fixes misc. typos 
found via `codespell -q 3`
 2018-04-13 07:30:23 +02:00
Georg Richter
8aa86f73ad CONC-302: 
Fix output of mariadb_config (if gssapi plugin was configured statically).
 2018-01-08 14:05:46 +01:00
Georg Richter
4ea36fd7cf Fix for MDEV-14514: Wrong exit code when an invalid option was passed to mariadb_config. 2017-12-05 11:06:12 +01:00
Vladislav Vaintroub
9b7b25993f Fix a warning 2017-11-13 14:46:50 +00:00
Georg Richter
7209efa5aa CONC-282: 
Connector/C now provides additional information for package version
mariadb_config --cc_version lists the package version
Beside MARIADB_PACKAGE_VERSION numeric representation MARIADB_PACKAGE_VERSION_ID can be used now within preprocessor directives
 2017-10-25 18:32:55 +02:00
Georg Richter
95fdfe9219 Fix for MDEV-13270: Wrong output for mariadb_config on OSX 2017-07-07 11:18:24 +02:00
Georg Richter
261d95ae0c Added option --tlsinfo for mariadb_config which returns the linked tls library and version, e.g 
- Schannel (without version number)
- OpenSSL 1.1.0c
- GnuTLS 3.4.10
 2017-02-23 20:08:57 +01:00
Georg Richter
6655a8194e Remove unused include file 
remove link to mariadbclient library
 2017-01-21 19:36:16 +01:00
Georg Richter
ee6f05cc73 fixed output for --plugindir: plugindir option now prints PLUGIN_DIR instead of MARIADB_PLUGINDIR 2017-01-04 16:34:15 +01:00
Vladislav Vaintroub
e34a595ce2 MDEV-11008 Connector/C integration does not respect INSTALL_LIBDIR 
or INSTALL_DOCDIR

Changed C/C to use the same cmake variables for
INSTALL_LIBDIR, INSTALL_BINDIR, INSTALL_INCLUDEDIR, INSTALL_PLUGINDIR


Small cleanups (remove -l/full/path/to/libc.so from mariadb_config output)
 2016-10-12 11:58:53 +00:00
Vladislav Vaintroub
da8977d670 Merge branch 'master' into serg-integr 2016-09-12 11:47:14 +00:00
Sergei Golubchik
7a787b1e3e C/C integration in MariaDB Server builds 
* make is usable as a CMake sub-project
  * put options in a separate namespace
  * but use parent project values when specified
* always specify COMPONENT when INSTALLing
* don't use PROJECT_SOURCE_DIR/PROJECT_BINARY_DIR

Also

* fix out-of-source builds (don't generate files
  in the CMAKE_SOURCE_DIR, always do it in CMAKE_BINARY_DIR)
* make subsequence cmake runs less verbose, use MESSAGE1
  to avoid repeating messages that didn't change
 2016-09-05 19:15:58 +02:00
Georg Richter
9f88e25fd6 Compiler warning fixes 2016-09-03 12:46:50 +02:00
Georg Richter
7615dc73a2 Fixed length packet for COM_MULTI parts 
(kudos to Sanja Byelkin)
 2016-08-31 19:08:59 +02:00
GeorgyKirichenko
56505d8fb6 Use PROJECT_SOURCE_DIR instead of CMAKE_SOURCE_DIR. Client library 
can be used as subdirectory in another cmake project.
 2016-04-27 17:54:07 +03:00
Georg Richter
2004962331 Fix for CONC-170: missing blank in mariadb_config --libs output 2016-03-24 18:10:06 +01:00
Georg Richter
e157d4fcad Fix for Solaris builds 2016-03-02 16:22:34 +01:00
Georg Richter
f7d7730bc1 renamed exported function mysql_reconnect to mariadb_reconnect 2016-02-24 08:26:34 +01:00
Georg Richter
27a66aa11c 10.2 fixes 
old pathword plugin is now static by default
prefixed PLUGINDIR (now MARIADB_PLUGINDIR)
 2016-02-20 11:55:58 +01:00