1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-08 17:02:21 +03:00
Commit Graph

51 Commits

Author SHA1 Message Date
6c70c33f12 bug#51925: 5.5 installed header file layout is incorrect
Additional space-in-directory-name protection.
2010-12-17 23:13:33 +00:00
a3deb16810 bug#51925: 5.5 installed header file layout is incorrect
The 'mysql' include sub-directory was copied directly into
include/ rather than retaining its own directory.

Fix this, and update mysql_config which needs additional
logic to detect the correct prefix for includes.
2010-12-17 23:08:43 +00:00
9ae1b1d157 Apply wlad's fix for bug#55215 2010-08-09 14:27:04 +01:00
9503a8e23f Manual merge from mysql-trunk.
Conflicts:
  - scripts/CMakeLists.txt
2010-07-19 18:00:29 +04:00
a10ae35328 Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled
Essentially, the problem is that safemalloc is excruciatingly
slow as it checks all allocated blocks for overrun at each
memory management primitive, yielding a almost exponential
slowdown for the memory management functions (malloc, realloc,
free). The overrun check basically consists of verifying some
bytes of a block for certain magic keys, which catches some
simple forms of overrun. Another minor problem is violation
of aliasing rules and that its own internal list of blocks
is prone to corruption.

Another issue with safemalloc is rather the maintenance cost
as the tool has a significant impact on the server code.
Given the magnitude of memory debuggers available nowadays,
especially those that are provided with the platform malloc
implementation, maintenance of a in-house and largely obsolete
memory debugger becomes a burden that is not worth the effort
due to its slowness and lack of support for detecting more
common forms of heap corruption.

Since there are third-party tools that can provide the same
functionality at a lower or comparable performance cost, the
solution is to simply remove safemalloc. Third-party tools
can provide the same functionality at a lower or comparable
performance cost. 

The removal of safemalloc also allows a simplification of the
malloc wrappers, removing quite a bit of kludge: redefinition
of my_malloc, my_free and the removal of the unused second
argument of my_free. Since free() always check whether the
supplied pointer is null, redudant checks are also removed.

Also, this patch adds unit testing for my_malloc and moves
my_realloc implementation into the same file as the other
memory allocation primitives.
2010-07-08 18:20:08 -03:00
18cd34153c bug#52737 plugin_dir is set to /usr/local/mysql/lib/plugin while
starting via mysqld_safe

Rather than hardcode the plugin directory, enhance mysql_config
to fix plugin path when running a relocated install, and use it
to provide the plugin directory to mysqld_safe.
2010-06-30 12:19:54 +01:00
768f2cdb6a Add --malloc-lib=LIB option to mysqld_safe to LD_PRELOAD a shared library for mysqld 2009-09-23 01:26:08 +02:00
d141e840a2 This is the 5.4 version of the fix for bug#47007
Unresolved reference to 'innodb_system_libs' in "mysql_config"

In 5.4.2, we use InnoDB 1.0.4 which does file IO via separate
threads, opposed to the use of asynchronous IO previously.

So there is no InnoDB call to "aio_read()" which was searched
in "librt", causing a "-lrt" value of "innodb_system_libs",
that whole variable is gone.

This fix was applied in the build of 5.4.2-beta.
2009-09-08 15:35:01 +02:00
8a774dcc68 Bug#34025: mysql_config is not returning -ldl lib flag needed when using embedded server
mysql_config did not output -ldl (or equivalent) when needed for --libmysqld-libs,
so its output could be insufficient to build an application using the embedded
server.

LIBDL was already set in configure; it's now propagated all the way into the
relevant mysql_config scripts.
2008-11-10 22:12:15 +01:00
e784898959 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2008-03-14 14:41:08 +01:00
0a7052e4d3 Merge kaamos.(none):/data/src/mysql-5.1
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-03-12 11:19:46 +03:00
2ebdd5ea2f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/build/5.1
2008-03-06 15:13:14 +00:00
874e919872 Bug#29645: Link failure when using the embedded server
mysql_config --cflags gave a flag that forced the HP/UX
C++ compiler into C-mode; as a result, C++ sources could
not be compiled correctly.

We now filter out the offending flag (like we do for Sun)
so that --cflags will work for both C and C++.
2008-02-25 07:50:55 +01:00
cd6e2ad99f Bug #21158 mysql_config doesn't include -lmygcc
Add -lmygcc to mysql_config output for libs, libs_r, and embedded_libs.

Required when linking against our static libs, if yassl is used, and gcc
used to build library is significantly different from that which is using
the library.
2008-02-14 01:05:25 -07:00
f988a7e600 Add new pkgplugindir handling to seperate plugins from libraries,
and allow override for binary distributions.  Extend mysql_config
to print compiled-in plugin location for third-party plugins to
use.  Resolves bug#31736.
2007-12-19 13:24:43 +00:00
37cbd6f7b4 Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-09-28 10:55:28 -06:00
5a1284ccb2 Merge ramayana.hindu.god:/home/tsmith/m/bk/50
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-09-28 10:54:49 -06:00
3c6ca8d6ed Bug #15327: configure: --with-tcp-port option being partially ignored
make sure that if builder configured with a non-standard (!= 3306)
default TCP port that value actually gets used throughout. if they
didn't configure a value, assume "use a sensible default", which
will be read from /etc/services or, failing that, from the factory
default. That makes the order of preference
- command-line option
- my.cnf, where applicable
- $MYSQL_TCP_PORT environment variable
- /etc/services (unless configured --with-tcp-port)
- default port (--with-tcp-port=... or factory default)
2007-09-13 16:19:46 +02:00
515d654e80 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-08-29 22:24:51 +02:00
cf285315eb mysql_config.sh:
Flag changed name in icc 10
2007-08-29 22:24:11 +02:00
6523aca729 my_strtoll10-x86.s:
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
2006-12-31 01:02:27 +01:00
226a5c833f Many files:
Changed header to GPL version 2 only
2006-12-23 20:17:15 +01:00
bf29b9db98 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
2006-09-25 01:32:55 +02:00
878416e054 mysql_config.sh:
Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
  Filter out icc specific options from cflags/libs(_r)
2006-09-25 00:54:46 +02:00
871eeadc94 Add SSL specific linker flags to --libmysqld-libs (Bug #21239) 2006-09-15 16:35:50 +02:00
67f2b0f3bc mysql_config.sh:
If installed, search built in lib path first, bug#13158
2006-03-29 14:59:53 +02:00
04f059c5bf mysql_config.sh:
Remove Solaris -xc99=none C option as C++ compiler can't handle it
2006-03-27 23:04:44 +02:00
35ae639477 mysql_config.sh:
We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322
2006-03-27 19:25:25 +02:00
5b79dbb2eb mysql_config.sh:
Added -lz to link using libmysqld
2005-09-28 13:39:28 +02:00
0cfed79ea5 Makefile.am:
Revert to shell test script for test targets
mysqltest.c:
  Windows pclose() returns error code in low byte
mysql_config.sh:
  Remove -Xa -xstrconst from --cflags for Sun C++
2005-09-24 02:42:38 +02:00
13773acc1b If mysql_config is a symlink, resolve it before trying to find the lib and
include directories relative to where it is located. (Bug #10986)
2005-06-24 17:59:19 -07:00
e531136c1f A fix for Bug#6273 "building fails on link": we should not use
CLIENT_LIBS in mysql_config as CLIENT_LIBS point to builddir when
we use the bundled zlib.
2005-02-05 01:21:16 +03:00
488170d38c Merge mysql.com:/home/jwinstead2/mysql-4.1-7021
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 20:03:06 +01:00
2acb738784 Add comment to make code for option-stripping in mysql_config more clear 2005-01-06 19:57:02 +01:00
d14f3d7675 Protect flags like -Wl,-O2 from being mangled by mysql_config (Bug #6964)
(Second commit of this patch -- first included wrong changes.)
2005-01-05 03:43:37 +01:00
30808e9ab9 Make sure to include ZLIB_LIBS in mysql_config --libs_r (Bug #7021) 2005-01-05 02:04:12 +01:00
2eec5d460d Fix for bug #5396(libmysql depends on SSL)
Since libmysqld has libmysql's capabilities it needs lssl to compile
2004-09-10 19:55:43 +05:00
a35955d60f \| is sed is on-portable 2004-02-20 12:02:34 +01:00
24413c7d8c fixed bug #1650 "mysql_config --libmysqd-libs misses libwrap" 2003-11-15 19:37:54 -04:00
0ce865b6b4 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-10-06 09:24:12 +02:00
9e68df2333 typo fixed (bug #1390 - incorrect mysql_config output) 2003-09-28 21:35:47 +02:00
f05a1c8394 Block SIGPIPE also for not threaded client programs.
Added --include and --libs_r options to mysql_config.
Added mysql_get_client_version() to client library
Fixed some minor benchmark issues
2003-09-23 13:36:01 +03:00
37cedc9a43 Fix 2002-08-14 13:05:38 +05:00
79796e989f Merge from 3.23.48 tree 2002-01-30 16:37:47 +02:00
89fa5f13d9 Fixed bug when making a range join based on information from a const table. 2002-01-18 00:43:50 +02:00
5c94a16422 merge with 3.23.47 2001-12-06 01:16:28 +02:00
0f71e337b3 Small changes to mysql_config.sh 2001-12-05 23:56:56 +02:00
2f91f2360a get correct paths in mysql_config even if the user moves basedir 2001-12-01 19:37:30 -07:00
88aff4bf85 Updated manual about embedded version.
Speed up column-completion in 'mysql'
Don't use ISAM if HAVE_ISAM is not defined
A lot of fixes for the embedded version.  All libraries are now included in libmysqld.a
Changed arguments to convert_dirname() to make it more general.
Renamed files in the 'merge' directory to all use a common prefix.
Don't compile both assembler and C functions on x86
2001-10-08 04:58:07 +03:00
38c035c098 Fixed portability bug in my_config.sh
Added print of --use-symbolic-links in mysqld
2001-05-28 02:45:19 +03:00