summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1tomas@whalegate.ndb.mysql.com2007-05-221-1/+1
|\ | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
| * Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndbmikael@dator3.(none)2007-05-101-1/+1
| |\ | | | | | | | | | into dator3.(none):/home/mikael/mysql_clones/rt-5.1
| | * Merge mikael@192.168.0.203:/home/mikael/mysql_clones/rt-5.1mikron@mikael-ronstr-ms-dator.local2007-05-081-1/+1
| | |\ | | | | | | | | | | | | into mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.1-ndb
| | | * Merge mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.0-ndbmikron@mikael-ronstr-ms-dator.local2007-05-071-1/+1
| | | |\ | | | | | | | | | | | | | | | into mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.1-ndb
| | | | * Fix SCI Transportermikron@mikael-ronstr-ms-dator.local2007-05-071-1/+1
| | | | |
| | | | * Merge ↵df@pippilotta.erinye.com2007-04-111-0/+24
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.0-build-work
* | | | | \ Merge siva.hindu.god:/home/tsmith/m/bk/51tsmith@siva.hindu.god2007-05-172-3/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | into siva.hindu.god:/home/tsmith/m/bk/maint/51
| * | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opttomas@whalegate.ndb.mysql.com2007-05-101-1/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
| | * | | | Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bjgni@dev3-221.dev.cn.tlan2007-05-081-1/+0
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
| | | * | | Merge dev3-164.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-new-ndb-bjdli@dev3-164.dev.cn.tlan2007-04-241-1/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | into dev3-164.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-23137
| | | | * | | ndb - fix for BUG#23137, ha_ndbcluster.m4 bug.dli@dev3-76.dev.cn.tlan2006-11-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Because NDB_CXXFLAGS is just used in ndb engine, moved NDB_CXXFLAGS from ha_ndbcluster.m4 to ndb/config/common.mk.am.
| * | | | | | WL#2936 - Falcon & MySQL plugin interface: server variablesistruewing@chilla.local2007-04-301-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | Avoid compiler warnings
* | | | | | Bug #28267 Cannot build with OpenSSLmsvensson@pilot.blaudden2007-05-071-1/+1
|/ / / / / | | | | | | | | | | | | | | | - Fix use of uninitialized variable in config/ac-macros/ssl.m4
* | | | | Merge ↵df@pippilotta.erinye.com2007-04-111-0/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ Merge ↵df@pippilotta.erinye.com2007-03-091-0/+24
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | 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
| | * | | | BUG#25601 Missing m4 macro MYSQL_CHECK_TIME_Tdf@pippilotta.erinye.com2007-03-091-0/+24
| | | | | |
* | | | | | Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0-buildkent@kent-amd64.(none)2007-04-111-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | into mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
| * | | | | my_memmem.c:kent@mysql.com/kent-amd64.(none)2007-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge mysql.com:/home/kent/bk/sotest/mysql-5.0-buildkent@kent-amd64.(none)2007-04-051-2/+11
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | into mysql.com:/home/kent/bk/sotest/mysql-5.1-build
| * | | | zlib.m4:kent@mysql.com/kent-amd64.(none)2007-04-051-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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"
* | | | | Merge mysql.com:/home/bar/mysql-5.0.b22378bar@mysql.com2007-03-291-0/+13
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | into mysql.com:/home/bar/mysql-5.1-new-rpl
| * | | Bug#22378 Make error, strings/ctype-utf8.c, uni_plane undeclaredbar@mysql.com2007-03-271-0/+13
| |/ / | | | | | | | | | | | | | | | - Fixing utf8_general_cs according to recent changes. - Compiling utf8_general_cs in pentium-debug-max configuration to avoid these problems in the future.
| * | Fixed the make distcheck problem. We only really need to create libndb.ver ↵mtaylor@qualinost.(none)2007-01-191-0/+9
| | | | | | | | | | | | if we are building Ndb.
* | | files are in storage/ndb in 5.1. fix merge from 5.0mtaylor@qualinost.(none)2007-01-191-2/+2
| | |
* | | We only want to do these things if we are building Ndb.mtaylor@qualinost.(none)2007-01-191-0/+11
| | |
* | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2007-01-122-34/+1
|\ \ \ | | | | | | | | | | | | into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
| * \ \ Merge mysql.com:/home/bkroot/mysql-5.1-new-rpllars@black.(none)2006-12-082-34/+1
| |\ \ \ | | | | | | | | | | | | | | | into mysql.com:/home/bk/MERGE/mysql-5.1-merge
| | * | | WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.cbell/Chuck@suse.vabb.com2006-12-072-34/+1
| | | | | | | | | | | | | | | | | | | | Please see worklog for details on files changed.
* | | | | WL#3630 (add embedded server to pushbuild)holyfoot/hf@mysql.com/hfmain.(none)2006-12-281-0/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Many files:kent@mysql.com/kent-amd64.(none)2006-11-291-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge mysql.com:/home/kent/bk/mysql-5.0kent@kent-amd64.(none)2006-11-271-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ / into mysql.com:/home/kent/bk/mysql-5.1
| * | ha_innodb.m4, Makefile.am, ha_ndbcluster.m4, Makefile.shared, ha_berkeley.m4:kent@mysql.com/kent-amd64.(none)2006-11-273-8/+8
| | | | | | | | | | | | Reenabled build outside source tree
| * | Use a direct reference to the yassl and taocrypt libtool libraries to link with msvensson@shellback.(none)2006-09-211-1/+2
| | |
| * | Bug#21327 OpenSSL-checking in configuremsvensson@neptunus.(none)2006-08-141-2/+2
| | | | | | | | | | | | | | | - Change $d to $libs as suggested. - Thanks to Michael Prohm for the patch!
| * | Merge xiphis.org:/home/antony/work2/p4-bug12096.2acurtis@xiphis.org2006-06-281-0/+22
| |\ \ | | | | | | | | | | | | into xiphis.org:/home/antony/work2/p4-bug12096.2-merge
| * | | Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_initmsvensson@shellback.(none)2006-05-311-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
* | | | Merge trift2.:/MySQL/M51/clone-5.1joerg@trift2.2006-11-011-0/+32
|\ \ \ \ | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1
| * | | | libmysqld/Makefile.am fixedholyfoot/hf@mysql.com/deer.(none)2006-10-191-5/+5
| | | | |
| * | | | letter's case fixedholyfoot/hf@mysql.com/deer.(none)2006-10-181-3/+3
| | | | |
| * | | | bug #23369 (Embedded library can't be linked)holyfoot/hf@mysql.com/deer.(none)2006-10-181-3/+35
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 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
* | | | BUG#21253 NdbApi.h should not include my_config.hstewart@willster.(none)2006-10-161-0/+13
|/ / /
* | | WL#3504 "plugin actions for engines' and plugins' unit tests"guilhem@gbichot3.local2006-09-151-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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'."
* | | Many files:kent@mysql.com/g4-2.local2006-08-211-263/+0
| | | | | | | | | | | | | | | Deleted config/ac-macros/ha_berkeley.m4 Removed more referenses to bdb
* | | compile-time definition of intptr typeserg@janus.mylan2006-08-011-30/+0
| | |
* | | Merge xiphis.org:/home/antony/work2/p4-bug12096.2acurtis@ltamd64.xiphis.org2006-06-221-0/+22
|\ \ \ | | |/ | |/| | | | into xiphis.org:/home/antony/work2/p4-bug12096.3
| * | traditional grep does not have -q optionacurtis@xiphis.org2006-06-211-1/+1
| | |
| * | Bug#12096acurtis@xiphis.org2006-05-311-0/+22
| |/ | | | | | | | | | | "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.
* | don't call plugins' configure scripts manually, use AC_CONFIG_SUBDIRSserg@serg.mylan2006-06-151-1/+1
| | | | | | | | | | don't add CFLAGS/CXXFLAGS to ./configure command line in config.status but _do_ add them before calling plugins' configure scripts
* | Merge jonas@perch:src/51-jonastomas@poseidon.ndb.mysql.com2006-06-121-1/+1
|\ \ | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
| * | ndb -jonas@perch.ndb.mysql.com2006-06-091-1/+1
| | | | | | | | | | | | restore --with-ndb-ccflags functionality