summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge polly.(none):/home/kaa/src/maint/bug31254/my51-bug31254unknown2007-10-121-2/+9
|\ | | | | | | | | | | into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
| * Merge polly.(none):/home/kaa/src/maint/bug31254/my50-bug31254unknown2007-10-121-2/+9
| |\ | | | | | | | | | | | | | | | | | | | | | into polly.(none):/home/kaa/src/maint/bug31254/my51-bug31254 include/my_global.h: Auto merged
| | * Fix for bug #31254: "Max_data_length" truncated / reported wrongunknown2007-10-121-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (compiler issue ?) Problem: Improper compile-time flags on AIX prevented use of files > 2 GB. This resulted in Max_data_length being truncated to 2 GB by MyISAM code. Solution: Reverted large-file changes from the fix for bug10776. We need to define _LARGE_FILES on AIX to have support for files > 2 GB. Since _LARGE_FILE_API is incompatible with _LARGE_FILES and may be automatically defined by including standards.h, we also need a workaround to avoid this conflict. config/ac-macros/large_file.m4: Reverted large-file changes from the fix for bug10776. We need to define _LARGE_FILES on AIX to have support for files > 2 GB. include/my_global.h: _LARGE_FILE_API is defined in standards.h that is automatically included by at least some C++ compilers on AIX. Since it is also incompatible with _LARGE_FILES which is required for POSIX IO calls to be largefile-safe, the only workaround is to explicitely #undef _LARGE_FILE_API.
| | * Merge trift2.:/MySQL/M50/push-5.0unknown2007-09-131-5/+2
| | |\ | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M50/tmp-5.0
| | * \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-buildunknown2007-08-011-8/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/maint/50 configure.in: Auto merged
* | | \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2007-09-262-12/+12
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/make-dist-stable/mysql-5.1-build configure.in: Auto merged mysql-test/Makefile.am: Auto merged
| * | | | Makefile.am:unknown2007-09-262-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always include all sub directories in "make dist" Removed incorrect comment configure.in: Unconditionally list make files in AC_CONFIG_FILES Removed 'thread_dirs', it is not used Minor cleanup compile-dist: Simplified the configure line needed for "make dist" to get it all zlib.m4, ssl.m4: Unconditionally list make files in AC_CONFIG_FILES Makefile.am: Removed DIST_SUBDIRS not needed Don't copy soft links as files into source package BUILD/compile-dist: Simplified the configure line needed for "make dist" to get it all config/ac-macros/ssl.m4: Unconditionally list make files in AC_CONFIG_FILES config/ac-macros/zlib.m4: Unconditionally list make files in AC_CONFIG_FILES libmysql/Makefile.am: Removed incorrect comment Makefile.am: Always include all sub directories in "make dist" mysql-test/Makefile.am: Removed DIST_SUBDIRS not needed libmysql_r/Makefile.am: Don't copy soft links as files into source package libmysqld/Makefile.am: Don't copy soft links as files into source package libmysqld/examples/Makefile.am: Don't copy soft links as files into source package sql/Makefile.am: Don't copy soft links as files into source package extra/Makefile.am: Always include all sub directories in "make dist" plugin/Makefile.am: Always include all sub directories in "make dist" configure.in: Unconditionally list make files in AC_CONFIG_FILES Removed 'thread_dirs', it is not used Minor cleanup
* | | | | Merge production.mysql.com:/usersnfs/jperkin/bk/tmp/bug-27520unknown2007-09-071-5/+2
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | into production.mysql.com:/usersnfs/jperkin/bk/trees/51/mysql-5.1 config/ac-macros/misc.m4: Auto merged
| * | | Fix bug#27520. For some unknown reason, libtool.m4 attemptsunknown2007-08-201-5/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to find "ar" but if it cannot be found sets AR=false. This leads to confusing failures during the build rather than at configure time. We have our own checks for ar, but as AR was already set earlier by the libtool tests they were never exectuted. Therefore, update the tests so that we catch any libtool failures, and run AC_CHECK_PROG explicitly to ensure that we see sensible output from configure prior to any potential failure. config/ac-macros/misc.m4: AC_CHECK_PROG does nothing if the first argument (variable) is already set, so remove redundant check for the empty string. This also ensures that a 'checking for ar' message is printed prior to any failure, which is far less confusing.
* | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2007-08-011-1/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/maint/51 BitKeeper/deleted/.del-CMakeLists.txt~1: Auto merged CMakeLists.txt: Auto merged configure.in: Auto merged sql/sql_parse.cc: Auto merged
| * \ \ Merge mysql.com:/home/kent/bk/config_h/mysql-5.0-buildunknown2007-07-301-1/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/config_h/mysql-5.1-build config/ac-macros/misc.m4: Auto merged configure.in: Auto merged include/Makefile.am: Auto merged mysql-test/std_data/cacert.pem: Auto merged mysql-test/std_data/client-cert.pem: Auto merged mysql-test/std_data/client-key.pem: Auto merged mysql-test/std_data/server-cert.pem: Auto merged mysql-test/std_data/server-key.pem: Auto merged mysys/my_pthread.c: Auto merged scripts/make_binary_distribution.sh: Auto merged BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6: Auto merged
| | * | Generate "config.h" directly into the "include" directory, later copiedunknown2007-07-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to "my_config.h". Not to pollute the top directory, and to get more control over what is included. Made the include path for "libedit" pick up its own "config.h" first. config/ac-macros/misc.m4: aclocal in automake 1.8 can't handle AC_REQUIRE on a user macro defined in the same included file. cmd-line-utils/libedit/Makefile.am: Changed include path so that current directory is taken first, as there is a "config.h" there with the same name as the one in top "include". configure.in: Generate "config.h" directly into "include", don't pollute top directory include/Makefile.am: Copy "config.h" from current directory to "my_config.h", added note in the make file why there are two identical files with different name. scripts/make_binary_distribution.sh: Removed copy of "config.h" from top directory, it is in "include" in a source tree.
| * | | Many files:unknown2007-07-231-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put back old code to check stack direction at configure time config/ac-macros/misc.m4: Put back old code to check stack direction at configure time configure.in: Put back old code to check stack direction at configure time include/config-netware.h: Put back old code to check stack direction at configure time include/config-win.h: Put back old code to check stack direction at configure time include/my_global.h: Put back old code to check stack direction at configure time sql/sql_parse.cc: Put back old code to check stack direction at configure time
* | | | Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2unknown2007-08-011-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5.1 specific fixes so cluster will build on AIX (with IBM compiler) config/ac-macros/ha_ndbcluster.m4: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (1) build NDB binaries as static on AIX. because that actually *works*. when building dynamic, with the IBM compiler (xlC_r), and the build breaks on AIX due to missing symbols (__vec__delete2 et al.), try adding -lhC to the Makefile. storage/ndb/src/mgmclient/Makefile.am: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (2) fix path storage/ndb/src/ndbapi/NdbScanOperation.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (3) __align is a keyword in xlC_r storage/ndb/test/ndbapi/testIndexStat.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4) gptr is now uchar* template can't be static on xlC_r? storage/ndb/test/ndbapi/test_event_merge.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4) gptr is now uchar* storage/ndb/test/run-test/main.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4) gptr is now uchar* storage/ndb/test/src/NDBT_Test.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4) gptr is now uchar*
* | | | Merge sin.intern.azundris.com:/home/tnurnberg/10776/50-10776unknown2007-08-011-8/+3
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sin.intern.azundris.com:/home/tnurnberg/10776/51-10776 include/mysql.h: Auto merged storage/ndb/src/mgmclient/Makefile.am: Auto merged storage/ndb/test/ndbapi/benchronja.cpp: Auto merged storage/ndb/test/ndbapi/flexAsynch.cpp: Auto merged storage/ndb/test/ndbapi/flexHammer.cpp: Auto merged storage/ndb/test/ndbapi/flexScan.cpp: Auto merged storage/ndb/test/ndbapi/flexTT.cpp: Auto merged storage/ndb/test/ndbapi/flexTimedAsynch.cpp: Auto merged storage/ndb/test/ndbapi/initronja.cpp: Auto merged storage/ndb/test/ndbapi/testOperations.cpp: Auto merged storage/ndb/test/ndbapi/testScanFilter.cpp: Auto merged storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp: Auto merged configure.in: manual merge storage/ndb/src/common/util/File.cpp: manual merge storage/ndb/src/mgmsrv/Makefile.am: manual merge
| * | Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2unknown2007-08-011-8/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysqld hasn't been built on AIX with ndb-everything in quite a while. this allowed a variety of changes to be added that broke the AIX build for both the GNU and IBM compilers (but the IBM suite in particular). Changeset lets build to complete on AIX 5.2 for users of the GNU and the IBM suite both. Tudo bem? config/ac-macros/large_file.m4: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (2) we no longer declare anything large-file on AIX. the GNU C++ compiler declares _LARGE_FILE_API all of its own, and either way we're now pulling in <standards.h> when on AIX, which defines _LARGE_FILE_API (if not already defined). configure.in: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (1) build NDB binaries as static on AIX. because that actually *works*. when building dynamic, with the IBM compiler (xlC_r), and the build breaks on AIX due to missing symbols (__vec__delete2 et al.), try adding -lhC to the Makefile. include/mysql.h: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (2) we're now pulling in <standards.h> when on AIX, which defines _LARGE_FILE_API (if not already defined). ndb/src/common/util/File.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (3) do not de-scope the standards, for they may be funky macros ndb/src/mgmclient/Makefile.am: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4) make IBM C++ compiler happy on AIX ndb/src/mgmsrv/Makefile.am: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (5) GNU compiler has no sense of humour about this ndb/test/ndbapi/benchronja.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6) MAXTHREADS collides with a #define from <sys/thread.h> on AIX (IBM compiler). Call it NDB_MAXTHREADS instead. Also explicitly #undef it here lest someone use it by habit and get really funny results. (K&R says we may #undef non-existent symbols.) ndb/test/ndbapi/flexAsynch.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6) MAXTHREADS collides with a #define from <sys/thread.h> on AIX (IBM compiler). Call it NDB_MAXTHREADS instead. Also explicitly #undef it here lest someone use it by habit and get really funny results. (K&R says we may #undef non-existent symbols.) ndb/test/ndbapi/flexHammer.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6) MAXTHREADS collides with a #define from <sys/thread.h> on AIX (IBM compiler). Call it NDB_MAXTHREADS instead. Also explicitly #undef it here lest someone use it by habit and get really funny results. (K&R says we may #undef non-existent symbols.) ndb/test/ndbapi/flexScan.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6) MAXTHREADS collides with a #define from <sys/thread.h> on AIX (IBM compiler). Call it NDB_MAXTHREADS instead. Also explicitly #undef it here lest someone use it by habit and get really funny results. (K&R says we may #undef non-existent symbols.) ndb/test/ndbapi/flexTT.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6) MAXTHREADS collides with a #define from <sys/thread.h> on AIX (IBM compiler). Call it NDB_MAXTHREADS instead. Also explicitly #undef it here lest someone use it by habit and get really funny results. (K&R says we may #undef non-existent symbols.) ndb/test/ndbapi/flexTimedAsynch.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6) MAXTHREADS collides with a #define from <sys/thread.h> on AIX (IBM compiler). Call it NDB_MAXTHREADS instead. Also explicitly #undef it here lest someone use it by habit and get really funny results. (K&R says we may #undef non-existent symbols.) ndb/test/ndbapi/initronja.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6) MAXTHREADS collides with a #define from <sys/thread.h> on AIX (IBM compiler). Call it NDB_MAXTHREADS instead. Also explicitly #undef it here lest someone use it by habit and get really funny results. (K&R says we may #undef non-existent symbols.) ndb/test/ndbapi/testOperations.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (7) IBM C compiler on AIX is not happy with the re-def. ndb/test/ndbapi/testScanFilter.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (8) The IBM C++ compiler on AIX doesn't like initializing from pow(). This works, but breaks a VAL (bool res_cal[TUPLE_NUM] ...) later on. ndb/test/odbc/SQL99_test/SQL99_test.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6) MAXTHREADS collides with a #define from <sys/thread.h> on AIX (IBM compiler). Call it NDB_MAXTHREADS instead. Also explicitly #undef it here lest someone use it by habit and get really funny results. (K&R says we may #undef non-existent symbols.)
* | sql_parse.cc, config-win.h, config-netware.h:unknown2007-05-272-25/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try determine stack direction at configure time compiler_flag.m4: Use AC_TRY_COMPILE and AC_TRY_LINK instead of AC_TRY_RUN where possible misc.m4, configure.in: Use fourth argument to AC_TRY_RUN, to be used in cross compilation Don't try determine stack direction at configure time configure.in: Use fourth argument to AC_TRY_RUN, to be used in cross compilation Don't try determine stack direction at configure time config/ac-macros/compiler_flag.m4: Use AC_TRY_COMPILE and AC_TRY_LINK instead of AC_TRY_RUN where possible config/ac-macros/misc.m4: Use fourth argument to AC_TRY_RUN, to be used in cross compilation Don't try determine stack direction at configure time include/config-netware.h: Don't try determine stack direction at configure time include/config-win.h: Don't try determine stack direction at configure time sql/sql_parse.cc: Don't try determine stack direction at configure time
* | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1unknown2007-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-ndbunknown2007-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.1unknown2007-05-081-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.1-ndb config/ac-macros/ha_ndbcluster.m4: Auto merged
| | | * \ Merge mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.0-ndbunknown2007-05-071-1/+1
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.1-ndb BUILD/Makefile.am: Auto merged config/ac-macros/ha_ndbcluster.m4: Auto merged storage/ndb/src/common/transporter/SCI_Transporter.cpp: Auto merged storage/ndb/src/common/transporter/SCI_Transporter.hpp: Auto merged libmysqld/Makefile.am: Manual merge libmysqld/examples/Makefile.am: Manual merge
| | | | * Fix SCI Transporterunknown2007-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config/ac-macros/ha_ndbcluster.m4: Fix SCI Transporter build part libmysqld/Makefile.am: Fix SCI Transporter build part libmysqld/examples/Makefile.am: Fix SCI Transporter build part
| | | | * Merge ↵unknown2007-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/51unknown2007-05-172-3/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/home/tsmith/m/bk/maint/51 client/mysqltest.c: Auto merged configure.in: Auto merged include/my_global.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/type_datetime.result: Auto merged mysql-test/t/outfile.test: Auto merged mysql-test/t/type_datetime.test: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/log.cc: Auto merged sql/my_decimal.cc: Auto merged sql/my_decimal.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sp.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_show.cc: Auto merged sql/structs.h: Auto merged storage/myisam/ha_myisam.cc: Auto merged
| * | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-optunknown2007-05-101-1/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user sql/field.cc: Auto merged sql/field.h: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/sql_table.cc: Auto merged sql/handler.cc: manual merge sql/mysqld.cc: manual merge sql/set_var.cc: manual merge sql/sql_plugin.cc: manual merge
| | * | | | Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bjunknown2007-05-081-1/+0
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb mysql-test/t/disabled.def: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_ndbcluster.h: Auto merged sql/handler.cc: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_plugin.cc: Auto merged sql/sql_table.cc: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged storage/ndb/src/ndbapi/ndberror.c: Auto merged storage/ndb/tools/restore/consumer_restore.cpp: Auto merged storage/ndb/tools/restore/restore_main.cpp: Auto merged
| | | * | | Merge dev3-164.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-new-ndb-bjunknown2007-04-241-1/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dev3-164.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-23137 config/ac-macros/ha_ndbcluster.m4: Auto merged storage/ndb/config/common.mk.am: Auto merged
| | | | * | | ndb - fix for BUG#23137, ha_ndbcluster.m4 bug.unknown2006-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. config/ac-macros/ha_ndbcluster.m4: removed NDB_CXXFLAGS. storage/ndb/config/common.mk.am: Added NDB_CXXFLAGS to AM_CXXFLAGS.
| * | | | | | WL#2936 - Falcon & MySQL plugin interface: server variablesunknown2007-04-301-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid compiler warnings cmd-line-utils/readline/rltty.c: Avoid a compiler warning config/ac-macros/misc.m4: Avoid a compiler warning, which could abort ./configure if CFLAGS contain -Werror.
* | | | | | Bug #28267 Cannot build with OpenSSLunknown2007-05-071-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix use of uninitialized variable in config/ac-macros/ssl.m4 config/ac-macros/ssl.m4: Use of uninitialized variable caused $openssl_includes to be set to -I when configuring mysql to compile with openSSL
* | | | | Merge ↵unknown2007-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 ↵unknown2007-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 config/ac-macros/misc.m4: Auto merged
| | * | | | BUG#25601 Missing m4 macro MYSQL_CHECK_TIME_Tunknown2007-03-091-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config/ac-macros/misc.m4: BUG#25601 MYSQL_CHECK_TIME_T macro is missing in 5.0 and upward, likely incorrectly merged up from 4.1. This patch is a verbatim copy from 4.1's acinclude.m4 (except for typos in comment).
* | | | | | Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0-buildunknown2007-04-111-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/tmp3/mysql-5.1-build config/ac-macros/zlib.m4: Auto merged mysys/my_memmem.c: Auto merged zlib/Makefile.am: Auto merged
| * | | | | my_memmem.c:unknown2007-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 zlib/Makefile.am: 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 config/ac-macros/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 mysys/my_memmem.c: Back port of include change and copyright from 5.1
* | | | | | Merge mysql.com:/home/kent/bk/sotest/mysql-5.0-buildunknown2007-04-051-2/+11
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/sotest/mysql-5.1-build BitKeeper/deleted/.del-SETUP.sh.rej: Auto merged BitKeeper/deleted/.del-configure.in.rej: Auto merged BitKeeper/deleted/.del-my_global.h.rej: Auto merged BitKeeper/deleted/.del-my_pthread.h.rej: Auto merged BitKeeper/deleted/.del-thr_alarm.c.rej: Auto merged config/ac-macros/zlib.m4: Auto merged configure.in: Auto merged zlib/Makefile.am: Auto merged scripts/make_binary_distribution.sh: SCCS merged
| * | | | zlib.m4:unknown2007-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" 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. config/ac-macros/zlib.m4: Only require the more recent zlibCompileFlags() when building the server, client zlib don't need it. scripts/make_binary_distribution.sh: Real "mysqlmanager" executable might be in ".libs" zlib/Makefile.am: Always build the bundled zlib static only
* | | | | Merge mysql.com:/home/bar/mysql-5.0.b22378unknown2007-03-291-0/+13
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/bar/mysql-5.1-new-rpl strings/ctype-utf8.c: Auto merged BUILD/compile-pentium-debug-max: After merge fix
| * | | Bug#22378 Make error, strings/ctype-utf8.c, uni_plane undeclaredunknown2007-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. BUILD/compile-pentium-debug-max: Enable compiling of experimental collations in compile-pentium-debug-max config/ac-macros/character_sets.m4: Adding hidden flag --with-experimental-collations, not seen in "configure --help". strings/ctype-utf8.c: Compilation failure changes: catching up with previous character set changes: - uni_plane is now not a global variables - adding new parameter into my_strnncollsp_utf8_cs - adding my_strnxfrm_len into MY_COLLATION_HANDLER for utf8_general_cs
| * | Fixed the make distcheck problem. We only really need to create libndb.ver ↵unknown2007-01-191-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if we are building Ndb. config/ac-macros/ha_ndbcluster.m4: We only need to create this file if we are building Ndb in the first place. Moving the code to ha_ndbcluster.m4 configure.in: We only need to create this file if we are building Ndb in the first place. Moving the code to ha_ndbcluster.m4 ndb/src/Makefile.am: BUILT_SOURCES is uneccesary. Removing it. The real problem was related to building or not building Ndb.
* | | files are in storage/ndb in 5.1. fix merge from 5.0unknown2007-01-191-2/+2
| | |
* | | We only want to do these things if we are building Ndb.unknown2007-01-191-0/+11
| | | | | | | | | | | | | | | configure.in: Moving these to ha_ndbcluster.m4
* | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rplunknown2007-01-122-34/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge client/mysqlbinlog.cc: Auto merged client/mysqldump.c: Auto merged configure.in: Auto merged include/config-win.h: Auto merged include/my_global.h: Auto merged include/my_pthread.h: Auto merged libmysqld/CMakeLists.txt: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/rpl_row_tabledefs_2myisam.result: Auto merged mysql-test/r/rpl_row_tabledefs_3innodb.result: Auto merged mysql-test/r/rpl_sp.result: Auto merged mysql-test/t/disabled.def: Auto merged mysys/my_thr_init.c: Auto merged sql/CMakeLists.txt: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/handler.cc: Auto merged sql/item_create.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/log.cc: Auto merged sql/log.h: Auto merged sql/log_event.h: Auto merged sql/mysql_priv.h: Auto merged sql/rpl_injector.cc: Auto merged sql/rpl_injector.h: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/slave.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_locale.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_view.cc: Auto merged sql/table.cc: Auto merged unittest/mysys/my_atomic-t.c: Auto merged sql/log_event.cc: Manual merge main->rpl sql/mysqld.cc: Manual merge main->rpl
| * \ \ Merge mysql.com:/home/bkroot/mysql-5.1-new-rplunknown2006-12-082-34/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/bk/MERGE/mysql-5.1-merge client/mysqlbinlog.cc: Auto merged client/mysqldump.c: Auto merged config/ac-macros/ha_ndbcluster.m4: Auto merged configure.in: Auto merged include/my_global.h: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/r/rpl_timezone.result: Auto merged mysql-test/t/disabled.def: Auto merged sql/handler.cc: Auto merged sql/item_create.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/log.cc: Auto merged sql/log.h: Auto merged sql/log_event.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/rpl_injector.h: Auto merged sql/set_var.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_view.cc: Auto merged sql/table.cc: Auto merged mysql-test/t/mysqldump.test: Manual merge sql/log_event.cc: manual merge
| | * | | WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.unknown2006-12-072-34/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Please see worklog for details on files changed. BitKeeper/deleted/.del-have_row_based.require: Delete: mysql-test/r/have_row_based.require BitKeeper/deleted/.del-not_row_based.require: Delete: mysql-test/r/not_row_based.require BitKeeper/deleted/.del-have_row_based.inc: Delete: mysql-test/include/have_row_based.inc BitKeeper/deleted/.del-not_row_based.inc: Delete: mysql-test/include/not_row_based.inc BitKeeper/deleted/.del-replication.m4: Delete: config/ac-macros/replication.m4
* | | | | WL#3630 (add embedded server to pushbuild)unknown2006-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. config/ac-macros/plugins.m4: condition_dependent_plugin_objects added libmysqld/Makefile.am: rules for ha_*.o files added condition_dependent_plugin_objects sent to linker libmysqld/lib_sql.cc: ddl_log initialization added mysql-test/r/flush_block_commit_notembedded.result: result fixed mysql-test/t/crash_commit_before.test: doesn't work in embedded server mysql-test/t/csv.test: replace_result added mysql-test/t/ps.test: doesn't work in embedded server should be fixed by separating ps_notembedded.test mysql-test/t/ps_1general.test: replace_result fixed mysql-test/t/ps_not_windows.test: doesn't work in embedded server mysql-test/t/trigger.test: replace_result fixed sql/sql_insert.cc: #ifdef HAVE_ROW_BASED_REPLICATION added storage/myisam/ha_myisam.cc: MY_UNPACK_FILENAME flag added
* | | | Many files:unknown2006-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 config/ac-macros/ssl.m4: Use libtool way of specifying yaSSL libraries libmysqld/Makefile.am: Adjusted path to yaSSL libtool libraries storage/ndb/config/type_kernel.mk.am: Changed paths to ndb include directory to include "storage" storage/ndb/config/type_ndbapi.mk.am: Changed paths to ndb include directory to include "storage" storage/ndb/config/type_ndbapitest.mk.am: Changed paths to ndb include directory to include "storage" storage/ndb/config/type_ndbapitools.mk.am: Changed paths to ndb include directory to include "storage" storage/ndb/config/type_util.mk.am: Changed paths to ndb include directory to include "storage"
* | | | Merge mysql.com:/home/kent/bk/mysql-5.0unknown2006-11-271-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.1 BitKeeper/deleted/.del-gen_rec.awk: Auto merged client/mysql_upgrade.c: Auto merged configure.in: Auto merged extra/yassl/src/Makefile.am: Auto merged extra/yassl/taocrypt/benchmark/Makefile.am: Auto merged extra/yassl/taocrypt/benchmark/benchmark.dsp: Auto merged extra/yassl/taocrypt/src/Makefile.am: Auto merged extra/yassl/taocrypt/taocrypt.dsp: Auto merged extra/yassl/taocrypt/taocrypt.vcproj: Auto merged extra/yassl/taocrypt/test.dsp: Auto merged extra/yassl/taocrypt/test/Makefile.am: Auto merged extra/yassl/testsuite/Makefile.am: Auto merged extra/yassl/testsuite/testsuite.dsp: Auto merged extra/yassl/yassl.dsp: Auto merged extra/yassl/yassl.vcproj: Auto merged include/my_sys.h: Auto merged libmysql/Makefile.shared: Auto merged mysql-test/mysql-test-run.pl: Auto merged BitKeeper/deleted/.del-ha_berkeley.m4: Auto merged mysql-test/lib/mtr_report.pl: Auto merged sql-common/my_time.c: Auto merged storage/ndb/config/common.mk.am: Auto merged storage/ndb/config/type_kernel.mk.am: Auto merged storage/ndb/config/type_ndbapi.mk.am: Auto merged storage/ndb/config/type_ndbapitest.mk.am: Auto merged storage/ndb/config/type_ndbapitools.mk.am: Auto merged storage/ndb/config/type_util.mk.am: Auto merged Docs/Makefile.am: SCCS merged
| * | ha_innodb.m4, Makefile.am, ha_ndbcluster.m4, Makefile.shared, ha_berkeley.m4:unknown2006-11-273-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reenabled build outside source tree config/ac-macros/ha_berkeley.m4: Reenabled build outside source tree config/ac-macros/ha_innodb.m4: Reenabled build outside source tree config/ac-macros/ha_ndbcluster.m4: Reenabled build outside source tree extra/yassl/src/Makefile.am: Reenabled build outside source tree extra/yassl/taocrypt/benchmark/Makefile.am: Reenabled build outside source tree extra/yassl/taocrypt/src/Makefile.am: Reenabled build outside source tree extra/yassl/taocrypt/test/Makefile.am: Reenabled build outside source tree extra/yassl/testsuite/Makefile.am: Reenabled build outside source tree libmysql/Makefile.shared: Reenabled build outside source tree ndb/src/mgmsrv/Makefile.am: Reenabled build outside source tree
| * | Use a direct reference to the yassl and taocrypt libtool libraries to link with unknown2006-09-211-1/+2
| | |
View Lorry Controller Status