summaryrefslogtreecommitdiff
path: root/configure.in
Commit message (Collapse)AuthorAgeFilesLines
* Mergeunknown2005-03-291-0/+1
|\ | | | | | | | | | | | | configure.in: Auto merged acinclude.m4: SCCS merged
| * Introduce "configure" support for a new '-with-big-tables' option that can ↵unknown2005-03-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replace the current way of passing '-DBIG_TABLES' to the compilers. This is needed even in 4.0, as 'Do-compile-all' must use this new approach for all "max" builds in 4.0, 4.1, and up. acinclude.m4: Provide a new macro 'MYSQL_CHECK_BIG_TABLES' to check a '-with-big-tables' option and set the CPP symbol 'BIG_TABLES' accordingly. configure.in: Call the new 'MYSQL_CHECK_BIG_TABLES' macro.
| * - bumped up version number in configure.in from 4.0.24 -> 4.0.25 (ChangeSet ↵unknown2005-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | 1.2073 was already tagged as 4.0.24) configure.in: - bumped up version number from 4.0.24 -> 4.0.25
| * configure.in:unknown2005-01-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add -DDBUG_ON to CXXFLAGS whenever it is added to CFLAGS. Thus, sql/ha_innodb.cc will be compiled with the same setting of UNIV_DEBUG as the rest of InnoDB, i.e., --with-debug enables InnoDB ut_ad() assertions everywhere. configure.in: Add -DDBUG_ON to CXXFLAGS whenever it is added to CFLAGS. Thus, sql/ha_innodb.cc will be compiled with the same setting of UNIV_DEBUG as the rest of InnoDB, i.e., --with-debug enables InnoDB ut_ad() assertions everywhere.
| * configure.in:unknown2004-12-201-1/+1
| | | | | | | | | | | | | | | | Increment from 4.0.23 to 4.0.24 configure.in: Increment from 4.0.23 to 4.0.24
* | Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-241-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zim.(none):/home/brian/mysql/mysql-4.1 configure.in: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged
| * | Additional storage engine called "blackhole". Customer request, and for that ↵unknown2005-03-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matter a Zawodny request. With this you can alter table to a type of table that would never store data. Its a /dev/null for a database. acinclude.m4: New macro rule for ha_blackhole. configure.in: Rule enabling blackhole engine sql/Makefile.am: Additions to Makefile for blackhole engine sql/handler.cc: Ifdef enable code for blackhole (and message for "what does this thing do"). sql/handler.h: Flag for storage engine type. sql/mysql_priv.h: Added blackhole type. sql/mysqld.cc: Updates for building backhole. sql/set_var.cc: Show variable for blackhole engine
* | | configure.in:unknown2005-03-091-1/+7
|/ / | | | | | | | | | | | | | | bug#5102, bug#6862 define HAVE_VIS_H to libedit only if header and strvis() exists configure.in: bug#5102, bug#6862 define HAVE_VIS_H to libedit only if header and strvis() exists
* | A way not to compile UCA collationsunknown2005-02-181-0/+18
| |
* | 1) Tag the 4.1.10 released version: bk tag -r 1.2159.8.1 "mysql-4.1.10"unknown2005-02-151-2/+2
| | | | | | | | | | | | | | | | 2) Raise the version number to 4.1.11. configure.in: Raise the version number from 4.1.10 to 4.1.11.
* | A fix for Bug#6273 "building fails on link": we should not useunknown2005-02-051-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CLIENT_LIBS in mysql_config as CLIENT_LIBS point to builddir when we use the bundled zlib. acinclude.m4: Extend MYSQL_CHECK_ZLIB_WITH_COMPRESS m4 macro to substitute ZLIB_DEPS - this is a special version of ZLIB_LIBS to use in mysql_config configure.in: Remove NON_THREADED_CLIENT_LIBS which weren't really NON_THREADED_CLIENT_LIBS and use NON_THREADED_LIBS instead. AC_SUBST NON_THREADED_LIBS and STATIC_NSS_FLAGS as they're now needed inside mysql_config.sh scripts/Makefile.am: Add STATIC_NSS_FLAGS, NON_THREADED_LIBS and ZLIB_DEPS to sed substitution list. scripts/mysql_config.sh: We can't use CLIENT_LIBS as in case when we use the bundled zlib it has a reference to $(top_builddir)/zlib. libs and libs_r now need to be specified explicitly. zlib/Makefile.am: Install libz.la in case it's used by MySQL: this way we guarantee that paths printed by mysql_config are valid in all cases.
* | Merge mysql.com:/data0/mysqldev/my/mysql-4.1unknown2005-02-021-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/data0/mysqldev/my/mysql-4.1-build configure.in: Auto merged
| * | Use -DUNIV_DEBUG (extra debugging for InnoDB) when configuring with --debug=fullunknown2005-02-021-2/+2
| | |
* | | fix linkerror on sol9x86unknown2005-02-021-0/+9
|/ / | | | | | | | | configure.in: fix linkerror on sol9x86
* | configure.inunknown2005-02-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't define UNIV_DEBUG in CFLAGS/CXXFLAGS anymore sql/mysqld.cc hide from the user options that do nothing sql/sql_update.cc better fix for uninitialized used_index configure.in: don't define UNIV_DEBUG in CFLAGS/CXXFLAGS anymore sql/mysqld.cc: hide from the user options that do nothing sql/sql_update.cc: better fix for uninitialized used_index
* | Remove unused configure.in name TOOLS_LIBS.unknown2005-01-281-10/+0
| | | | | | | | | | | | configure.in: Remove unused TOOLS_LIBS: LIBS and CLIENT_LIBS should be enough for the global configure.in
* | Only enable Innodb extra debugging when using the --debug=full configure optionunknown2005-01-261-2/+2
| | | | | | | | | | | | | | | | | | BUILD/SETUP.sh: Abort if wrong options BUILD/compile-pentium64-debug: Always use full debugging innobase/fil/fil0fil.c: Fixed wrong printf() format
* | Added -DDBUG_ON to CXXFLAGS when compiling with debuggingunknown2005-01-261-2/+2
| | | | | | | | | | | | | | This fixes a memory allocation bug in Innobase as structs was defined differently in .c and .cc files
* | configure.in:unknown2005-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add SJIS version of Japanese error messages. Windows version should include this new file, instead of the EUC-JP version. configure.in: Add SJIS version of Japanese error messages. Windows version should include this new file, instead of the EUC-JP version.
* | bug#7693 - ndb unknown2005-01-191-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when using shm transporter, set sigmask on each thread using pthread_sigmask configure.in: Add more functions needed for SHM ndb/src/common/portlib/NdbThread.c: 1) Create thread wrapper function 2) block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER ndb/src/common/transporter/TransporterRegistry.cpp: (un)block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER sql/ha_ndbcluster.cc: cast pointer to UintPtr before printout
* | Fix 'make distclean' goal.unknown2005-01-181-1/+1
| |
* | bumped up ndb versionunknown2005-01-141-1/+1
| | | | | | | | | | | | | | | | compatible with 4.1.9 configure.in: bumped up ndb version
* | - bumped up the version number in configure.in from 4.1.9 to 4.1.10unknown2005-01-131-1/+1
| | | | | | | | | | | | | | | | - tagged ChangeSet 1.2207 as "mysql-4.1.9" configure.in: - bumped up the version number from 4.1.9 to 4.1.10
* | bug#7690 - ndb startup with shm, use sigaction to escape SA_RESETHANDunknown2005-01-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | configure.in: Check for sigaction used in SHM_Transporter ndb/src/common/transporter/SHM_Transporter.cpp: remove unused variable ndb/src/common/transporter/TransporterRegistry.cpp: 1) remove unused variable 2) Use sigaction instead of signal to install signal handler This as signal uses SA_RESETHAND
* | Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1unknown2004-12-301-1/+15
|\ \ | | | | | | | | | | | | configure.in: Auto merged
| * | Clean up the handling of "server" and "client" directories, while still ↵unknown2004-12-301-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avoiding the double listing of common directories in 'SUBDIRS' macro ("make distclean" had failed due to that). Solves bug#7368: "regex make error in 4.1.8" BitKeeper/etc/ignore: Added ndb/include/ndb_version.h ndb/include/ndb_global.h to the ignore list Makefile.am: Build the 'SUBDIRS' list from the new variable 'sql_union_dirs', not the old "client" and "servers" lists which will overlap. That overlap worked for build runs, but it caused failures of 'make distclean' etc because the overlapping directories were cleaned twice which could not work. Solves bug#7368: "regex make error in 4.1.8" configure.in: Introduce a new variable 'sql_union_dirs' to contain those directories which are needed for either server or client. This is needed to have complete "server" and "client" directory lists in 'Makefile' but prevent double listing in 'SUBDIRS' (see the comment for 'Makefile.am'). Solves bug#7368: "regex make error in 4.1.8"
* | | - make sure that MYSQL_VERSION_ID created by "configure" does not contain anyunknown2004-12-271-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | non-numerical characters (if $VERSION was e.g. "4.1.8a", $MYSQL_VERSION_ID resulted in "40108a", which broke the build as MYSQL_VERSION_ID must be numerical) configure.in: - make sure that MYSQL_VERSION_ID does not contain any non-numerical characters (if $VERSION was e.g. "4.1.8a", $MYSQL_VERSION_ID resulted in "40108a", which broke the build as MYSQL_VERSION_ID must be numerical)
* | automatically configure with shared memory transporter for ndb if functions ↵unknown2004-12-201-4/+15
| | | | | | | | are available
* | mergeunknown2004-12-171-8/+21
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged ndb/include/Makefile.am: Auto merged ndb/include/kernel/LogLevel.hpp: Auto merged ndb/include/mgmapi/mgmapi.h: Auto merged ndb/include/ndbapi/NdbConnection.hpp: Auto merged ndb/include/ndbapi/NdbDictionary.hpp: Auto merged ndb/src/common/debugger/EventLogger.cpp: Auto merged ndb/src/common/logger/FileLogHandler.cpp: Auto merged ndb/src/common/logger/Logger.cpp: Auto merged ndb/src/common/mgmcommon/ConfigRetriever.cpp: Auto merged ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Auto merged ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/kernel/main.cpp: Auto merged ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp: Auto merged ndb/src/kernel/vm/Configuration.cpp: Auto merged ndb/src/mgmapi/mgmapi.cpp: Auto merged ndb/src/mgmsrv/InitConfigFileParser.cpp: Auto merged ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged ndb/src/mgmsrv/MgmtSrvr.hpp: Auto merged ndb/src/mgmsrv/Services.cpp: Auto merged ndb/src/mgmsrv/Services.hpp: Auto merged ndb/src/mgmsrv/main.cpp: Auto merged ndb/src/ndbapi/NdbConnection.cpp: Auto merged ndb/src/ndbapi/TransporterFacade.cpp: Auto merged ndb/src/ndbapi/ndberror.c: Auto merged ndb/tools/Makefile.am: Auto merged
| * | Bumb up ndb versionunknown2004-12-171-1/+1
| | |
| * | - bumped up version number in configure.in from 4.1.8 to 4.1.9unknown2004-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | - tagged ChangeSet 1.2173 as "mysql-4.1.8" configure.in: - bumped up version number from 4.1.8 to 4.1.9
| * | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-061-3/+14
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 configure.in: Auto merged
| | * | wixed ndb-debug option for configureunknown2004-12-061-4/+4
| | | |
| | * | added configure option to control extra ndb debug options,unknown2004-12-031-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | for release debug build please configure with --without-ndb-debug
| * | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-061-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1 configure.in: Auto merged
| | * | configure.in:unknown2004-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | latin1_spanish_ci produced unknown collation error. configure.in: latin1_spanish_ci produced unknown collation error.
| * | | Change to prevent the failure of "make distclean" on the missing ↵unknown2004-12-021-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | 'regex/Makefile' (and, later, 'strings/Makefile'). configure.in: The subdirectories 'strings' and 'regex' were each contained in both the 'sql_client_dirs' and the 'sql_server_dirs' macro. As these are used to form the (Makefile) macro 'SUBDIRS' and 'DIST_SUBDIRS', these subdirectories will get listed there twice. This causes a failure of the (recursive) "make distclean", so this double inclusion must be prevented.
| * | configure.in:unknown2004-11-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | A work-around for SCO, disable use of clock_gettime configure.in: A work-around for SCO, disable use of clock_gettime
* | | Merge mysql.com:/home/jonas/src/mysql-4.1-fixunknown2004-12-061-1/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/wl1744 BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged ndb/include/Makefile.am: Auto merged ndb/src/common/mgmcommon/ConfigRetriever.cpp: Auto merged ndb/src/common/util/version.c: Auto merged ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Auto merged ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Auto merged ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged ndb/src/mgmsrv/main.cpp: Auto merged ndb/src/ndbapi/NdbConnection.cpp: Auto merged sql/ha_ndbcluster.cc: Auto merged
| * | fix for mysqladmin link problemunknown2004-11-181-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .c -> .cc fix source dist problem for ndb fix type check problem for mysqladmin client/Makefile.am: fix for mysqladmin link problem .c -> .cc client/mysqladmin.cc: fix for mysqladmin link problem .c -> .cc configure.in: fix for mysqladmin link problem .c -> .cc ndb/include/Makefile.am: fix source dist problem for ndb ndb/src/mgmclient/CommandInterpreter.cpp: fix type check problem ndb/src/mgmclient/ndb_mgmclient.hpp: fix type check problem ndb/src/mgmclient/ndb_mgmclient.h: fix type check problem
* | | mergeunknown2004-11-161-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in: Auto merged ndb/src/Makefile.am: Auto merged ndb/src/common/mgmcommon/Makefile.am: Auto merged ndb/src/common/portlib/Makefile.am: Auto merged ndb/src/common/portlib/NdbConfig.c: Auto merged ndb/src/common/transporter/TransporterRegistry.cpp: Auto merged ndb/src/kernel/blocks/backup/Makefile.am: Auto merged ndb/src/mgmapi/Makefile.am: Auto merged ndb/src/mgmclient/Makefile.am: Auto merged ndb/tools/Makefile.am: Auto merged
| * | changed compile order, mysqladmin with ndbcluster extensions needs ndb ↵unknown2004-11-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to be compiled first added libs variable for ndbmgmclient used by mysqladmin add linkage with @ndb_mgmclient_libs@ additional options for ndbcluster added support for managing the cluster to mysqladmin added DEFINE_CXA_PURE_VIRTUAL flag to CFLAGS to enable linkage with c++ libs use macros for C_MODE_START/END so that define of FIX_GCC_LINKING_PROBLEM works in c-programs Makefile.am: changed compile order, mysqladming with ndbcluster extensions needs ndb to be compiled first acinclude.m4: added libs variable for ndbmgmclient used by mysqladmin client/Makefile.am: add linkage with @ndb_mgmclient_libs@ client/client_priv.h: additional options for ndbcluster client/mysqladmin.c: added support for managing the cluster to mysqladmin configure.in: added DEFINE_CXA_PURE_VIRTUAL flag to CFLAGS to enable linkage with c++ libs include/my_global.h: use macros for C_MODE_START/END so that define of FIX_GCC_LINKING_PROBLEM works in c-programs
| * | moved ndb_restore together with rest of the ndb toolsunknown2004-11-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kernel includes needed by ndb_restore changed link order moved LocalConfig to mgmapi Moved NdbConfig to Portlib mgmapi to use LocalConfig for connectstring parsing instead of it's own enable usage of "NULL" connectstring for default new ndbmgmclient lib that can be used by e.g. mysqladmin later LocalConfig no longer needed here, now in mgmapi Send connectstring to mgmapi instead added valid connectstring to be with only host without port i.e. valid connectstring =host1,host2,host3 default port will be added ndb/src/common/portlib/NdbConfig.c: Rename: ndb/src/common/mgmcommon/NdbConfig.c -> ndb/src/common/portlib/NdbConfig.c ndb/include/portlib/NdbConfig.h: Rename: ndb/include/mgmcommon/NdbConfig.h -> ndb/include/portlib/NdbConfig.h ndb/include/mgmapi/LocalConfig.hpp: Rename: ndb/include/mgmcommon/LocalConfig.hpp -> ndb/include/mgmapi/LocalConfig.hpp ndb/tools/restore/Makefile.am: Rename: ndb/src/kernel/blocks/backup/restore/Makefile.am -> ndb/tools/restore/Makefile.am ndb/tools/restore/consumer.cpp: Rename: ndb/src/kernel/blocks/backup/restore/consumer.cpp -> ndb/tools/restore/consumer.cpp ndb/tools/restore/consumer.hpp: Rename: ndb/src/kernel/blocks/backup/restore/consumer.hpp -> ndb/tools/restore/consumer.hpp ndb/tools/restore/consumer_printer.hpp: Rename: ndb/src/kernel/blocks/backup/restore/consumer_printer.hpp -> ndb/tools/restore/consumer_printer.hpp ndb/tools/restore/consumer_printer.cpp: Rename: ndb/src/kernel/blocks/backup/restore/consumer_printer.cpp -> ndb/tools/restore/consumer_printer.cpp ndb/tools/restore/consumer_restore.hpp: Rename: ndb/src/kernel/blocks/backup/restore/consumer_restore.hpp -> ndb/tools/restore/consumer_restore.hpp ndb/tools/restore/main.cpp: Rename: ndb/src/kernel/blocks/backup/restore/main.cpp -> ndb/tools/restore/main.cpp ndb/tools/restore/consumer_restorem.cpp: Rename: ndb/src/kernel/blocks/backup/restore/consumer_restorem.cpp -> ndb/tools/restore/consumer_restorem.cpp configure.in: moved ndb_restore together with rest of the ndb tools ndb/config/type_ndbapitools.mk.am: kernel includes needed by ndb_restore ndb/src/Makefile.am: changed link order ndb/src/common/mgmcommon/Makefile.am: mived LocalConfig to mgmapi ndb/src/common/portlib/Makefile.am: Moved NdbConfig to Portlib ndb/src/kernel/blocks/backup/Makefile.am: moved restore together with rest of ndb tools ndb/src/mgmapi/LocalConfig.cpp: added valid connectstring to be with only host without port i.e. valid connectstring =host1,host2,host3 default port will be added ndb/src/mgmapi/Makefile.am: LocalConfig part of the libmgmapi ndb/src/mgmapi/mgmapi.cpp: mgmapi to use LocalConfig for connectstring parsing instead of it's own ndb/src/mgmclient/CommandInterpreter.cpp: enable usage of "NULL" connectstring for default ndb/src/mgmclient/Makefile.am: new ndbmgmclient lib that can be used by e.g. mysqladmin later ndb/src/mgmclient/main.cpp: LocalConfig no longer needed here, now in mgmapi Send connectstring to mgmapi instead ndb/tools/Makefile.am: add ndb_restore to make of tools ndb/tools/restore/Restore.cpp: moved include BackupFormat and NdbDictionaryImpl to Restore.hpp ndb/tools/restore/Restore.hpp: moved include BackupFormat and NdbDictionaryImpl to Restore.hpp ndb/tools/restore/consumer_restore.cpp: moved include BackupFormat and NdbDictionaryImpl to Restore.hpp ndb/tools/waiter.cpp: LocalConfig moved
* | | Merge mysql.com:/home/jonas/src/mysql-4.1unknown2004-11-151-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/wl1744 BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged
| * | merge with 4.0unknown2004-11-121-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-Makefile.am: Delete: Docs/Images/Makefile.am Build-tools/Bootstrap: Auto merged Docs/Makefile.am: Auto merged configure.in: Auto merged include/mysql.h: Auto merged innobase/dict/dict0dict.c: Auto merged libmysql/libmysql.c: Auto merged mysys/default.c: Auto merged scripts/mysqld_safe.sh: Auto merged sql/log.cc: Auto merged mysql-test/t/mix_innodb_myisam_binlog.test: Auto merged sql/mysqld.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_table.cc: Auto merged client/mysqldump.c: merge with 4.0 (This only reorders options) sql/ha_innodb.cc: merge with 4.0 (Keep original code) sql/time.cc: Note that part of this patch is done in my_time.c
| | * Merge siva.hindu.god:/opt/home/tim/m/40/bkunknown2004-11-041-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/opt/home/tim/m/40/a configure.in: Auto merged
| | | * Portability fixes to mysqld_safe for non-Linux systems. Fix FIND_PROCunknown2004-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for Solaris test, and fix if @IS_LINUX@ test in mysqld_safe itself. configure.in: Portability fix for FIND_PROC setting; on Solaris (and probably others), 'ps -p $$' inside a shell script just returns 'sh' for command line, even though $0 contains the filename. So, use 'ps -fp $$' in the test (it shows the full command line, e.g., 'sh configure'). Leave the actual FIND_PROC command as-is, since mysqld itself is not a shell script. scripts/mysqld_safe.sh: Portability fix for mysqld_safe on non-Linux systems. A bogus use of 'if' and 'test' caused non-bash shells to enter a section meant to be run only on Linux systems. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * | The files stored in "Docs/Images" within the "mysqldocs" BK tree must be ↵unknown2004-11-041-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | included in the source tar-ball for distribution. This is done by using the "DISTFILES" macro in a new "Docs/Images/Makefile". As the source BK tree does not contain these files, they are copied from the "mysqldocs" tree at release build time. This changeset relies on "bk commit - mysqldoc tree (joerg:1.2276)" of today. Build-tools/Bootstrap: Copy the relevant files with "Docs/Images" from the "mysqldocs" BK tree into the build tree, ensuring that the "Makefile*" from the source BK tree are removed before. Docs/Images/Makefile.am: This dummy file is only needed to satisfy the Makefile hierarchy, at release build time it will be replaced by its counterpart from the "mysqldocs" BK tree. Docs/Makefile.am: Include the new "Docs/Images/Makefile" in the Makefile hierarchy. configure.in: Ensure that the autotools will handle the new "Docs/Images/Makefile.am".
| | * - bumped up version number from 4.0.22 to 4.0.23 in configure.inunknown2004-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | - tagged ChangeSet@1.2048.1.2 as "mysql-4.0.22" configure.in: - bumped up version number from 4.0.22 to 4.0.23
* | | wl1744 - ndb win portunknown2004-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improve ndb_global.h configure.in: check for some more includes ndb/include/ndb_global.h.in: better ndb_global.h.in
View Lorry Controller Status