summaryrefslogtreecommitdiff
path: root/zlib
Commit message (Collapse)AuthorAgeFilesLines
* zlib: remove redundant and generated filesSergei Golubchik2022-07-26193-51773/+0
| | | | followup for 4bc34ef36f9
* Merge branch 'merge-zlib' into 10.3Oleksandr Byelkin2022-07-22201-1068/+58427
|\
| * 1.2.12Oleksandr Byelkin2022-07-2286-7854/+12197
| |
| * 1.2.11Oleksandr Byelkin2022-07-21253-0/+76196
|
* Merge branch '10.2' into 10.3Oleksandr Byelkin2020-12-231-39/+0
|\
| * MDEV-24034 Policy CMP0075 is not set during compileVladislav Vaintroub2020-12-151-39/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The policy is not set for 10.2 If it is set, CMake would complain about bundled zlib for which the policy is not set. Fix: - Set policy for 10.2 for the top level project. For 10.3+ it was already set - Cleanup zlib to remove unneeded stuff. It is an internal static library, it needs none of PROJECT, library versioning, RC file on Windows. The name of the library on Unix does not make any difference, since it is static and compiled in.
* | Lintian complains on spelling errorFaustin Lammler2019-12-021-1/+1
|/ | | | | The lintian check complains on spelling error: https://salsa.debian.org/mariadb-team/mariadb-10.3/-/jobs/95739
* Merge remote-tracking branch 'connect/10.2' into 10.2Oleksandr Byelkin2019-08-301-1/+3
|\
| * In CONNECT version 1.6.10 NOSQL facility is enhanced by a new way to ↵Olivier Bertrand2019-08-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | retrieve NOSQL data. In addition to files and Mongo collections, JSON as well as XML and CSV data can be retrieved from the net as answers from REST queries. Because it uses and external package (cpprestsdk) this is currently available only to MariaDB servers compiled from source. -- Add compile flags needed on Windows /MD or /MDd (debug) -- Also include some changes needed on Linux modified: storage/connect/CMakeLists.txt - Add the xtrc tracing function modified: storage/connect/global.h modified: storage/connect/plugutil.cpp - Modify tracing to use xtrc and some typo modified: storage/connect/array.cpp modified: storage/connect/block.h modified: storage/connect/restget.cpp - Fix compilation error when ZIP is not supported modified: storage/connect/ha_connect.cc modified: storage/connect/tabfmt.cpp - Add some tracing + typo modified: storage/connect/mycat.cc modified: storage/connect/tabjson.cpp - Add conditional code based on MARIADB This to be able to use the same code in CONNECT and EOM modules modified: storage/connect/osutil.h modified: storage/connect/tabrest.cpp - Replace PlugSetPath by some concat (crashed on Fedora) + typo modified: storage/connect/reldef.cpp - Try to fix test failures modified: zlib/CMakeLists.txt
* | Merge 10.1 into 10.2Marko Mäkelä2019-07-181-3/+2
|\ \
| * | restore RESTRICT_SYMBOL_EXPORTS(zlib)Sergei Golubchik2019-07-101-3/+2
| | | | | | | | | | | | | | | | | | that was lost in c54271723c6 remove zlib/libxml2 workaround in CONNECT
* | | Merge 10.1 into 10.2Marko Mäkelä2019-05-131-1/+1
|\ \ \ | |/ / | | / | |/ |/|
| * Update FSF AddressVicențiu Ciorbaru2019-05-111-1/+1
| | | | | | | | * Update wrong zip-code
* | Merge 10.1 into 10.2Marko Mäkelä2018-11-0674-3385/+13895
|\ \ | |/
| * Bug #26275510 BUNDLED ZLIB DOESN'T INCLUDE FIXES FOR SOME VULNERABILITIESAditya A2018-07-0974-3388/+13893
| | | | | | | | Upgrading the zlib lib to 1.2.11
| * Backport from trunk:Tor Didriksen2014-05-071-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#18187290 ISSUE WITH BUILDING MYSQL USING CMAKE 2.8.12 We want to upgrade to VS2013 on Windows. In order to do this, we need to upgrade to cmake 2.8.12 This has introduced some incompatibilities for .pdb files, and "make install" no longer works. To reproduce: cmake --build . --target package --config debug The fix: Rather than installing .pdb files for static libraries, we use the /Z7 flag to store symbolic debugging information in the .obj files.
| * Updated/added copyright headersMurthy Narkedimilli2014-01-061-1/+1
| |
| * Bug 13878021 - WINDOWS PACKAGE THAT INCLUDES .PDB FILES FOR INTERMEDIATE ↵Sreedhar.S2013-10-091-0/+5
| | | | | | | | LIBRARIES USED
| * WL#5665: Removal of the autotools-based build systemDavi Arnaut2010-11-201-35/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The autotools-based build system has been superseded and is being removed in order to ease the maintenance burden on developers tweaking and maintaining the build system. In order to support tools that need to extract the server version, a new file that (only) contains the server version, called VERSION, is introduced. The file contents are human and machine-readable. The format is: MYSQL_VERSION_MAJOR=5 MYSQL_VERSION_MINOR=5 MYSQL_VERSION_PATCH=8 MYSQL_VERSION_EXTRA=-rc The CMake based version extraction in cmake/mysql_version.cmake is changed to extract the version from this file. The configure to CMake wrapper is retained for backwards compatibility and to support the BUILD/ scripts. Also, a new a makefile target show-dist-name that prints the server version is introduced.
| * Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect).Alexander Nozdrin2010-08-121-3/+2
| | | | | | Fixing copyright text.
| * Unset the execute bit where it's not needed.Davi Arnaut2010-07-031-0/+0
| |
| * Another incarnation of the patch for Bug#30708Alexander Nozdrin2010-05-191-3/+0
| | | | | | | | | | | | | | | | | | (make relies GNU extentions). The patch was partially backport from 6.0. Original comment: bug#30708: make relies GNU extensions. Now that we no longer use BitKeeper we can safely remove the SCCS handling with no loss of functionality.
| * - Introduce MYSQL_ADD_PLUGIN that replaces MYSQL_STORAGE_ENGINEVladislav Vaintroub2009-12-011-0/+1
| | | | | | | | - Fix semisync library prefix (remove lib on Unixes) - restrict exported symbols from zlib and yassl (fvisibility=hidden)
| * implement convenience librariesVladislav Vaintroub2009-11-241-3/+1
| |
| * WL#5161 : Cross-platform build with CMakeVladislav Vaintroub2009-11-091-10/+7
| |
| * The header "config.h" needs to be included "early" to control other headers.Kent Boortz2008-10-131-0/+5
| | | | | | | | | | This time the inclusion of <stdio.h> before "config.h" enabled legacy large file support, seek64() and similar, on AIX breaking the compile of "gzio.c"
| * Merge main 5.0 branch -> 5.0-build (team tree).Joerg Bruehe2008-10-041-1/+1
| |\
| | * Changes for Visual Studio 9iggy@slim.2008-04-071-1/+1
| | |
| * | let's try to avoid re-defining _vsnprintf on WindowsDaniel Fischer2008-08-131-2/+2
| |/
| * CMakeLists.txt, README, configure.jskent@mysql.com/kent-amd64.(none)2007-08-031-3/+6
| | | | | | | | | | Several adjustments to make client libraries pass the link test on both win32 and winx64, Visual Studio 2003 and 2005 (bug#30118)
| * CMakeLists.txt (several), make_win_bin_dist:kent@mysql.com/kent-amd64.(none)2007-08-021-1/+5
| | | | | | | | | | | | | | | | | | | | | | Aligned client library build and use with the Unix version when it comes to what source to include directly in the builds, and what libraries to link with (bug#30118). Also reviewed, corrected and made more clear when static or dynamic Thread Local Storage is to be used. Some code duplication was removed, and some redundant library usage were removed, reducing the risk of incorrect TLS usage.
| * my_memmem.c:kent@mysql.com/kent-amd64.(none)2007-04-111-8/+9
| | | | | | | | | | | | | | | | Back port of include change and copyright from 5.1 Makefile.am, zlib.m4: Use separate libtool convenience library for the bundled zlib to embed into executables and shared libraries created, and one to install into the pkglib directory
| * zlib.m4:kent@mysql.com/kent-amd64.(none)2007-04-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Only require the more recent zlibCompileFlags() when building the server, client zlib don't need it. Makefile.am: Always build the bundled zlib static only configure.in: Look for dlopen() even if --with-mysqld-ldflags constains "-static", as this is not the same as the flag to "ld", it just informs "libtool" to link static with libraries created part of the build, even if there exists shared versions. make_binary_distribution.sh: Real "mysqlmanager" executable might be in ".libs"
| * my_strtoll10-x86.s:kent@mysql.com/kent-amd64.(none)2006-12-312-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected spelling in copyright text Makefile.am: Don't update the files from BitKeeper Many files: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header Many files: Added GPL copyright text Removed files: Docs/Support/colspec-fix.pl Docs/Support/docbook-fixup.pl Docs/Support/docbook-prefix.pl Docs/Support/docbook-split Docs/Support/make-docbook Docs/Support/make-makefile Docs/Support/test-make-manual Docs/Support/test-make-manual-de Docs/Support/xwf
| * Many files:kent@mysql.com/kent-amd64.(none)2006-12-231-2/+1
| | | | | | | | Changed header to GPL version 2 only
| * Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@mysql.com/myoffice.izhnet.ru2006-09-181-0/+2
| |\ | | | | | | | | | into mysql.com:/usr/home/ram/work/5.0.b18267
| | * fix for bug #18267: pthreads library in single-threaded libraries causes ↵ramil/ram@mysql.com/myoffice.izhnet.ru2006-08-161-0/+2
| | | | | | | | | | | | | | | | | | dlopen() to fail on HP/UX - zlib doesn't need a thread lib.
| * | make dist changes for Cmake buildgeorg@lmy002.wdf.sap.corp2006-09-011-1/+1
| | |
| * | Additional files for cmake supportgeorg@lmy002.wdf.sap.corp2006-08-311-0/+8
| |/
| * Changes after initial patch to #15787SergeyV@selena.2006-01-233-1/+12
| |
| * Fixes bug #15787. Fix makes available _FILE_OFFSET_BITS definition forSergeyV@selena.2006-01-122-2/+6
| | | | | | | | | | | | zlib library in order to enable support of files larger than 2Gb. Providing an effective test is hardly possible, since the problem starts only when archive table becomes larger than 2Gb.
| * Makefile.am:rparranovo@mysql.com2005-12-151-1/+1
| | | | | | | | - libtool wants spaces on parameters for its command line options
| * Makefile.am:rparranovo@mysql.com2005-12-151-0/+2
| | | | | | | | - modified zlib/Makefile.am so we now generate libz.so.1.2.3 instead of libz.so.0.0.0
| * Import zlib-1.2.3 libraryjimw@mysql.com2005-08-0922-213/+1008
| |
| * Apply security patch to bundled zlib for CAN-2005-2096. (Bug #11844)jimw@mysql.com2005-07-111-1/+1
| |
| * upgrade zlib to 1.2.2serg@serg.mylan2005-03-2317-135/+249
| |
| * A fix for Bug#6273 "building fails on link": we should not usekonstantin@mysql.com2005-02-051-1/+1
| | | | | | | | | | CLIENT_LIBS in mysql_config as CLIENT_LIBS point to builddir when we use the bundled zlib.
| * WL#1518 "make bundled zlib usable for unix builds", post review fixes:konstantin@mysql.com2004-07-271-5/+5
| | | | | | | | | | | | | | - comment for AC_DEFINE(HAVE_COMPRESS) fixed - build convenience library from zlib: we need to compile it into both libmysqlclient.a and libmysqlclient.so - --with-zlib-dir=bundled configure option
| * WL#1518, "make bundled zlib usable for unix builds": konstantin@mysql.com2004-07-241-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | required autotools macro written and deployed in all apropriate Makefile.ams. Use cases checked: - linux, standard location of zlib, no ndb - linux, standard locatoin of zlib, with ndb - linux, non-standard location of zlib, no ndb - hpux11, use of bundled zlib, no ndb The only non-checked case is non-standard location of zlib (or use of bundled zlib) + ndb. I wasn't able to check it as ndb/ just won't compile on beasts like AIX52 or HPUX11, where such a check is possible. It didn't compile there before as these systems dont't have installed zlib, so nothing got broken ;)
| * First step of implementation of WL#1518 "make bundled zlibkonstantin@mysql.com2004-07-21105-16634/+5726
| | | | | | | | usable for unix builds": zlib 1.2.1 imported