Commit graph

166 commits

Author SHA1 Message Date
df@pippilotta.erinye.com
4869a255be Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-25601
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
2007-04-11 13:33:15 +02:00
kent@kent-amd64.(none)
473b1f31d5 Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
2007-04-11 01:48:43 +02:00
kent@mysql.com/kent-amd64.(none)
8bcdaa86cf my_memmem.c:
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
2007-04-11 01:47:42 +02:00
kent@kent-amd64.(none)
6a8582a8bc Merge mysql.com:/home/kent/bk/sotest/mysql-5.0-build
into  mysql.com:/home/kent/bk/sotest/mysql-5.1-build
2007-04-05 08:42:32 +02:00
kent@mysql.com/kent-amd64.(none)
463b34e77b zlib.m4:
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"
2007-04-05 08:36:56 +02:00
bar@mysql.com
3099b103ce Merge mysql.com:/home/bar/mysql-5.0.b22378
into  mysql.com:/home/bar/mysql-5.1-new-rpl
2007-03-29 10:03:59 +05:00
bar@mysql.com
daa7e9c386 Bug#22378 Make error, strings/ctype-utf8.c, uni_plane undeclared
- Fixing utf8_general_cs according to recent changes.
- Compiling utf8_general_cs in pentium-debug-max configuration
  to avoid these problems in the future.
2007-03-27 15:06:41 +05:00
df@pippilotta.erinye.com
9c3b446664 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-25601
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-25601
2007-03-09 10:19:50 +01:00
df@pippilotta.erinye.com
43a57774d9 BUG#25601 Missing m4 macro MYSQL_CHECK_TIME_T 2007-03-09 10:17:21 +01:00
mtaylor@qualinost.(none)
c77cebec11 files are in storage/ndb in 5.1. fix merge from 5.0 2007-01-19 17:06:53 -08:00
mtaylor@qualinost.(none)
8778f60112 We only want to do these things if we are building Ndb. 2007-01-19 17:02:46 -08:00
mtaylor@qualinost.(none)
dab88cfaa3 Fixed the make distcheck problem. We only really need to create libndb.ver if we are building Ndb. 2007-01-19 16:54:01 -08:00
lars/lthalmann@dl145j.mysql.com
1e356251a0 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-01-12 12:31:44 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
842b23a8fc WL#3630 (add embedded server to pushbuild)
5.1-related fixes
libmysqld/Makefile.am fixed to recompile and link ha_*.cc files that
keep dependance on THD structure.
Minor fixes to make tests working.
2006-12-28 09:42:04 +04:00
lars@black.(none)
d85ca0dc1d Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-12-08 23:41:29 +01:00
cbell/Chuck@suse.vabb.com
9f36c1c286 WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
2006-12-07 09:18:35 -05:00
kent@mysql.com/kent-amd64.(none)
ea5c7f9756 Many files:
Changed paths to ndb include directory to include "storage"
Makefile.am:
  Adjusted path to yaSSL libtool libraries
ssl.m4:
  Use libtool way of specifying yaSSL libraries
2006-11-29 18:36:51 +01:00
kent@kent-amd64.(none)
e99c548bcd Merge mysql.com:/home/kent/bk/mysql-5.0
into  mysql.com:/home/kent/bk/mysql-5.1
2006-11-27 23:12:05 +01:00
kent@mysql.com/kent-amd64.(none)
1b61612f86 ha_innodb.m4, Makefile.am, ha_ndbcluster.m4, Makefile.shared, ha_berkeley.m4:
Reenabled build outside source tree
2006-11-27 21:15:25 +01:00
joerg@trift2.
0d27df6f1a Merge trift2.:/MySQL/M51/clone-5.1
into  trift2.:/MySQL/M51/push-5.1
2006-11-01 13:26:03 +01:00
holyfoot/hf@mysql.com/deer.(none)
ff25d2b71a libmysqld/Makefile.am fixed 2006-10-19 16:39:24 +05:00
holyfoot/hf@mysql.com/deer.(none)
fc35165805 letter's case fixed 2006-10-18 18:48:38 +05:00
holyfoot/hf@mysql.com/deer.(none)
b8e31d05f1 bug #23369 (Embedded library can't be linked)
Problem is that some files moved to storage/*/ still are dependent
on sql/ code (usually use members of THD structure)
that can get different being compiled with another #define-s
Code added to recompile these for the embedded server
2006-10-18 17:03:37 +05:00
stewart@willster.(none)
975e2f37b9 BUG#21253 NdbApi.h should not include my_config.h 2006-10-16 17:01:01 +10:00
msvensson@shellback.(none)
346730ee6b Use a direct reference to the yassl and taocrypt libtool libraries to link with 2006-09-21 11:37:08 +02:00
guilhem@gbichot3.local
09c5a83416 WL#3504 "plugin actions for engines' and plugins' unit tests"
for push in 5.1 (I will inform Trudy).
Storage engines and plugins can now have unit tests to test their components; such
test must be an executable C/C++ program which name ends with '-t' and which is
obeys the mytap protocol, it must be stored in the storage engine's or plugin's
source directory (storage/<engine> or plugin/<plugin>) or any subdirectories of
this.
The top-level Makefile target "test-unit" will run all unit tests: it will scan
the engines' and plugins' directories, recursively, and execute all executable
files which name ends with '-t'."
2006-09-15 15:15:24 +02:00
kent@mysql.com/g4-2.local
b329f2c3ef Many files:
Deleted config/ac-macros/ha_berkeley.m4
  Removed more referenses to bdb
2006-08-21 15:34:29 +02:00
msvensson@neptunus.(none)
91c2e68c2b Bug#21327 OpenSSL-checking in configure
- Change $d to $libs as suggested.
 - Thanks to Michael Prohm for the patch!
2006-08-14 20:16:47 +02:00
serg@janus.mylan
12dc638abd compile-time definition of intptr type 2006-08-01 14:02:19 +02:00
acurtis@xiphis.org
f242546e85 Merge xiphis.org:/home/antony/work2/p4-bug12096.2
into  xiphis.org:/home/antony/work2/p4-bug12096.2-merge
2006-06-28 09:54:40 -07:00
acurtis@ltamd64.xiphis.org
d2b5205b65 Merge xiphis.org:/home/antony/work2/p4-bug12096.2
into  xiphis.org:/home/antony/work2/p4-bug12096.3
2006-06-22 11:00:01 -07:00
acurtis@xiphis.org
9d74f0c601 traditional grep does not have -q option 2006-06-21 20:27:52 -07:00
serg@serg.mylan
3c609f0aa3 don't call plugins' configure scripts manually, use AC_CONFIG_SUBDIRS
don't add CFLAGS/CXXFLAGS to ./configure command line in config.status
but _do_ add them before calling plugins' configure scripts
2006-06-15 21:43:29 +02:00
tomas@poseidon.ndb.mysql.com
faa2f09107 Merge jonas@perch:src/51-jonas
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-12 13:46:10 +02:00
jonas@perch.ndb.mysql.com
e3323e7b90 ndb -
restore --with-ndb-ccflags functionality
2006-06-09 09:06:43 +02:00
serg@serg.mylan
5409997d49 unittest:
rename *.t* to *-t* to be automake-friendly
  simplify Makefiles
test_atomic.c:
  move to unittest, add GPL comment, fix warnings, convert to tap framework.
configure:
  remove custom tests for available types, use AC_CHECK_TYPE instead
x86-gcc.h:
  fix gcc -ansi errors while maintaining readability
ignore:
  added *-t
2006-06-01 12:25:47 +02:00
msvensson@shellback.(none)
20217ba36f Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_init
- Include prefix files that renames all public functions in yaSSLs
   OpenSSL API to ya<function_name>. They will otherwise conflict
   with OpenSSL functions if loaded by an application that uses OpenSSL
   as well as libmysqlclient with yaSSL support.
2006-05-31 16:19:06 +02:00
acurtis@xiphis.org
23e612ae11 Bug#12096
"Add line for non-executable stack in .s files"
  Fix so that configure will use "--noexecstack" for assembler if gcc supports
  option and compiled C doesn't need executable stack.
2006-05-31 00:07:58 -07:00
msvensson@neptunus.(none)
5df9964651 Bug#20002 Old --with-openssl and --with-yassl options just silently ignored
- Terminate configure with error(and message) if --with-yassl or --with-openssl is used.
2006-05-23 10:07:07 +02:00
msvensson@neptunus.(none)
eadbb3d1f9 Merge neptunus.(none):/home/msvensson/mysql/bug18818/my51-bug18818
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-18 18:26:52 +02:00
msvensson@neptunus.(none)
f4567f9f92 BUG#18818 configure: No longer finds OpenSSL on Mac OS X
- Implement new switch --with-ssl to configure used for both bundled yaSSL or OpenSSL
2006-05-17 13:59:37 +02:00
tomas@poseidon.ndb.mysql.com
5971c0872b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-15 20:35:17 +02:00
msvensson@neptunus.(none)
5f62c30332 Merge neptunus.(none):/home/msvensson/mysql/bug18818/my50-bug18818
into  neptunus.(none):/home/msvensson/mysql/bug18818/my51-bug18818
2006-05-12 11:32:43 +02:00
msvensson@neptunus.(none)
0472f7eb44 Bug#18818 configure: No longer finds OpenSSL on Mac OS X
- Remove usage of $shrext_cmds variable
   - Test for libs using all known library file endings
2006-05-12 11:29:31 +02:00
holyfoot@mysql.com
4d4b5c8137 Merge 2006-05-12 14:16:20 +05:00
serg@sergbook.mysql.com
6158fc15d8 apparently "sinclude" is consireded by aclocal (up to 1.9.5)
by a dirty word, and it complains about it, even in a comment.
2006-05-10 13:57:58 -04:00
serg@sergbook.mysql.com
f15dde450c a workaround for aclocal-1.8 bug 2006-05-10 11:27:38 -04:00
serg@sergbook.mysql.com
549fe7c850 auto-set MYSQL_PLUGIN_DIRECTORY for plug.in files 2006-05-06 07:43:18 -04:00
serg@sergbook.mysql.com
376117eb98 auto-include plug.in, remove the need for plugins to modify configure.in 2006-05-04 17:14:56 -04:00
serg@sergbook.mysql.com
17b46953ca cleanup - don't test in configure what belongs to m4 2006-05-04 14:15:37 -04:00