summaryrefslogtreecommitdiff
path: root/configure.in
Commit message (Collapse)AuthorAgeFilesLines
* Raise version number after cloning 5.0.52unknown2007-11-201-2/+2
|
* Merge trift2.:/MySQL/M50/bug31644-5.0unknown2007-10-191-0/+5
|\ | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M50/push-5.0 configure.in: Auto merged scripts/Makefile.am: Auto merged
| * Modify "mysqlbug" ("scripts/mysqlbug.sh") so that it differs between the ↵unknown2007-10-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | original and the modified values of the compile-related variables used in "configure". Make the necessary adjustments in "configure.in" and "scripts/Makefile.am". This fixes bug#31644 Values of *FLAGS that were used for building packages is missed in mysqlbug configure.in: Add more variables to the "substitution" list: SAVE_CC, SAVE_CXX, ASFLAGS. This is necessary so that the "mysqlbug" script can output the variables affecting compilation with both their original (on call) and final (modified) values. This work is related to fixing bug#31644 Values of *FLAGS that were used for building packages is missed in mysqlbug scripts/Makefile.am: Clearly differ between the original and the modified values of the compile-related variables used in "configure". This is to fix bug#31644 Values of *FLAGS that were used for building packages is missed in mysqlbug scripts/mysqlbug.sh: Have separate variables "COMP_CALL_INFO" and "COMP_RUN_INFO" which contain the original (call parameters, environment) and the modified values of the "configure" variables controlling the compile process. This fixes bug#31644 Values of *FLAGS that were used for building packages is missed in mysqlbug
* | Merge trift2.:/MySQL/M50/mysql-5.0unknown2007-10-191-1/+1
|\ \ | |/ | | | | | | | | | | | | into trift2.:/MySQL/M50/push-5.0 configure.in: Auto merged
| * Allow for different directories containing the "libc",unknown2007-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | as it may well happen with 32- vs 64-bit Linux systems. This patch was proposed immediately with the report of Bug #29658 wrong test for static nss checking on linux, doesn't cover all platforms
* | Removed debian dir. It was a mistake to embed it in the tree in the first ↵unknown2007-10-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | place. BitKeeper/deleted/.del-Makefile.am~2cb643bedd5f474: Delete: debian/Makefile.am BitKeeper/deleted/.del-README.Maintainer: Delete: debian/README.Maintainer BitKeeper/deleted/.del-changelog: Delete: debian/changelog BitKeeper/deleted/.del-compat: Delete: debian/compat BitKeeper/deleted/.del-control.in: Delete: debian/control.in BitKeeper/deleted/.del-copyright.more: Delete: debian/copyright.more BitKeeper/deleted/.del-copyright: Delete: debian/copyright BitKeeper/deleted/.del-defs.mk.in: Delete: debian/defs.mk.in BitKeeper/deleted/.del-libmysqlclientSLIB-dev.README.Maintainer.in: Delete: debian/libmysqlclientSLIB-dev.README.Maintainer.in BitKeeper/deleted/.del-libmysqlclientSLIB-dev.dirs.in: Delete: debian/libmysqlclientSLIB-dev.dirs.in BitKeeper/deleted/.del-libmysqlclientSLIB-dev.docs.in: Delete: debian/libmysqlclientSLIB-dev.docs.in BitKeeper/deleted/.del-libmysqlclientSLIB-dev.examples.in: Delete: debian/libmysqlclientSLIB-dev.examples.in BitKeeper/deleted/.del-libmysqlclientSLIB-dev.files.in: Delete: debian/libmysqlclientSLIB-dev.files.in BitKeeper/deleted/.del-libmysqlclientSLIB-dev.links.in: Delete: debian/libmysqlclientSLIB-dev.links.in BitKeeper/deleted/.del-libmysqlclientSLIBoff.README.Debian.in: Delete: debian/libmysqlclientSLIBoff.README.Debian.in BitKeeper/deleted/.del-libmysqlclientSLIBoff.dirs.in: Delete: debian/libmysqlclientSLIBoff.dirs.in BitKeeper/deleted/.del-libmysqlclientSLIBoff.docs.in: Delete: debian/libmysqlclientSLIBoff.docs.in BitKeeper/deleted/.del-libmysqlclientSLIBoff.files.in: Delete: debian/libmysqlclientSLIBoff.files.in BitKeeper/deleted/.del-libmysqlclientSLIBoff.postinst.in: Delete: debian/libmysqlclientSLIBoff.postinst.in BitKeeper/deleted/.del-libndbclientNLIB-dev.dirs.in: Delete: debian/libndbclientNLIB-dev.dirs.in BitKeeper/deleted/.del-libndbclientNLIB-dev.files.in: Delete: debian/libndbclientNLIB-dev.files.in BitKeeper/deleted/.del-libndbclientNLIB-dev.links.in: Delete: debian/libndbclientNLIB-dev.links.in BitKeeper/deleted/.del-libndbclientNLIB.README.Debian.in: Delete: debian/libndbclientNLIB.README.Debian.in BitKeeper/deleted/.del-libndbclientNLIB.dirs.in: Delete: debian/libndbclientNLIB.dirs.in BitKeeper/deleted/.del-libndbclientNLIB.files.in: Delete: debian/libndbclientNLIB.files.in BitKeeper/deleted/.del-libndbclientNLIB.postinst.in: Delete: debian/libndbclientNLIB.postinst.in BitKeeper/deleted/.del-mysql-client-BASE.NEWS.in: Delete: debian/mysql-client-BASE.NEWS.in BitKeeper/deleted/.del-mysql-client-BASE.README.Debian.in: Delete: debian/mysql-client-BASE.README.Debian.in BitKeeper/deleted/.del-mysql-client-BASE.dirs.in: Delete: debian/mysql-client-BASE.dirs.in BitKeeper/deleted/.del-mysql-client-BASE.docs.in: Delete: debian/mysql-client-BASE.docs.in BitKeeper/deleted/.del-mysql-client-BASE.files.in: Delete: debian/mysql-client-BASE.files.in BitKeeper/deleted/.del-mysql-client-BASE.lintian-overrides.in: Delete: debian/mysql-client-BASE.lintian-overrides.in BitKeeper/deleted/.del-mysql-common.README.Debian.in: Delete: debian/mysql-common.README.Debian.in BitKeeper/deleted/.del-mysql-common.dirs.in: Delete: debian/mysql-common.dirs.in BitKeeper/deleted/.del-mysql-common.files.in: Delete: debian/mysql-common.files.in BitKeeper/deleted/.del-mysql-common.postrm.in: Delete: debian/mysql-common.postrm.in BitKeeper/deleted/.del-mysql-common.preinst.in: Delete: debian/mysql-common.preinst.in BitKeeper/deleted/.del-mysql-extra-BASE.dirs.in: Delete: debian/mysql-extra-BASE.dirs.in BitKeeper/deleted/.del-mysql-extra-BASE.files.in: Delete: debian/mysql-extra-BASE.files.in BitKeeper/deleted/.del-mysql-management-BASE.dirs.in: Delete: debian/mysql-management-BASE.dirs.in BitKeeper/deleted/.del-mysql-management-BASE.files.in: Delete: debian/mysql-management-BASE.files.in BitKeeper/deleted/.del-mysql-management-BASE.mysql-management.init.in: Delete: debian/mysql-management-BASE.mysql-management.init.in BitKeeper/deleted/.del-mysql-server-BASE.NEWS.in: Delete: debian/mysql-server-BASE.NEWS.in BitKeeper/deleted/.del-mysql-server-BASE.README.Debian.in: Delete: debian/mysql-server-BASE.README.Debian.in BitKeeper/deleted/.del-mysql-server-BASE.config.in: Delete: debian/mysql-server-BASE.config.in BitKeeper/deleted/.del-mysql-server-BASE.dirs.in: Delete: debian/mysql-server-BASE.dirs.in BitKeeper/deleted/.del-mysql-server-BASE.docs.in: Delete: debian/mysql-server-BASE.docs.in BitKeeper/deleted/.del-mysql-server-BASE.files.in: Delete: debian/mysql-server-BASE.files.in BitKeeper/deleted/.del-mysql-server-BASE.links.in: Delete: debian/mysql-server-BASE.links.in BitKeeper/deleted/.del-mysql-server-BASE.lintian-overrides.in: Delete: debian/mysql-server-BASE.lintian-overrides.in BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.paranoid.in: Delete: debian/mysql-server-BASE.logcheck.ignore.paranoid.in BitKeeper/deleted/.del-my.cnf: Delete: debian/additions/my.cnf BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.server.in: Delete: debian/mysql-server-BASE.logcheck.ignore.server.in BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.workstation.in: Delete: debian/mysql-server-BASE.logcheck.ignore.workstation.in BitKeeper/deleted/.del-mysql-server-BASE.mysql-server.logrotate.in: Delete: debian/mysql-server-BASE.mysql-server.logrotate.in BitKeeper/deleted/.del-mysql-server-BASE.postinst.in: Delete: debian/mysql-server-BASE.postinst.in BitKeeper/deleted/.del-mysql-server-BASE.postrm.in: Delete: debian/mysql-server-BASE.postrm.in BitKeeper/deleted/.del-mysql-server-BASE.preinst.in: Delete: debian/mysql-server-BASE.preinst.in BitKeeper/deleted/.del-mysql-server-BASE.prerm.in: Delete: debian/mysql-server-BASE.prerm.in BitKeeper/deleted/.del-mysql-server-BASE.templates.in: Delete: debian/mysql-server-BASE.templates.in BitKeeper/deleted/.del-mysql-server-PREV.preinst.in: Delete: debian/mysql-server-PREV.preinst.in BitKeeper/deleted/.del-mysql-server.lintian-overrides: Delete: debian/additions/mysql-server.lintian-overrides BitKeeper/deleted/.del-mysql-server.preinst.in: Delete: debian/mysql-server.preinst.in BitKeeper/deleted/.del-mysql-storage-BASE.dirs.in: Delete: debian/mysql-storage-BASE.dirs.in BitKeeper/deleted/.del-mysql-storage-BASE.files.in: Delete: debian/mysql-storage-BASE.files.in BitKeeper/deleted/.del-mysql-storage-BASE.mysql-storage.init.in: Delete: debian/mysql-storage-BASE.mysql-storage.init.in BitKeeper/deleted/.del-mysql-test-BASE.dirs.in: Delete: debian/mysql-test-BASE.dirs.in BitKeeper/deleted/.del-mysql-test-BASE.files.in: Delete: debian/mysql-test-BASE.files.in BitKeeper/deleted/.del-mysql-tools-BASE.dirs.in: Delete: debian/mysql-tools-BASE.dirs.in BitKeeper/deleted/.del-mysql-tools-BASE.files.in: Delete: debian/mysql-tools-BASE.files.in BitKeeper/deleted/.del-rules: Delete: debian/rules BitKeeper/deleted/.del-source.lintian-overrides.in: Delete: debian/source.lintian-overrides.in BitKeeper/deleted/.del-watch: Delete: debian/watch BitKeeper/deleted/.del-POTFILES.in.in: Delete: debian/po/POTFILES.in.in BitKeeper/deleted/.del-ca.po: Delete: debian/po/ca.po BitKeeper/deleted/.del-cs.po: Delete: debian/po/cs.po BitKeeper/deleted/.del-da.po: Delete: debian/po/da.po BitKeeper/deleted/.del-de.po: Delete: debian/po/de.po BitKeeper/deleted/.del-es.po: Delete: debian/po/es.po BitKeeper/deleted/.del-eu.po: Delete: debian/po/eu.po BitKeeper/deleted/.del-fr.po: Delete: debian/po/fr.po BitKeeper/deleted/.del-gl.po: Delete: debian/po/gl.po BitKeeper/deleted/.del-it.po: Delete: debian/po/it.po BitKeeper/deleted/.del-ja.po: Delete: debian/po/ja.po BitKeeper/deleted/.del-nb.po: Delete: debian/po/nb.po BitKeeper/deleted/.del-ndb_mgmd.cnf: Delete: debian/additions/ndb_mgmd.cnf BitKeeper/deleted/.del-nl.po: Delete: debian/po/nl.po BitKeeper/deleted/.del-pt.po: Delete: debian/po/pt.po BitKeeper/deleted/.del-pt_BR.po: Delete: debian/po/pt_BR.po BitKeeper/deleted/.del-ro.po: Delete: debian/po/ro.po BitKeeper/deleted/.del-ru.po: Delete: debian/po/ru.po BitKeeper/deleted/.del-sv.po: Delete: debian/po/sv.po BitKeeper/deleted/.del-templates.pot: Delete: debian/po/templates.pot BitKeeper/deleted/.del-tr.po: Delete: debian/po/tr.po
* | Merge ramayana.hindu.god:/home/tsmith/m/bk/50unknown2007-09-281-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/maint/50 configure.in: Auto merged scripts/mysql_config.sh: Auto merged libmysql/libmysql.c: Manual merge
| * Raise version number after cloning 5.0.50unknown2007-09-261-2/+2
| |
* | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-09-151-1/+28
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/tnurnberg/15327/50-15327 client/mysql.cc: Auto merged client/mysql_upgrade.c: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged configure.in: Auto merged libmysql/libmysql.c: Auto merged mysql-test/Makefile.am: Auto merged scripts/Makefile.am: Auto merged sql/mysqld.cc: Auto merged tests/mysql_client_test.c: Auto merged
| * Bug #15327: configure: --with-tcp-port option being partially ignoredunknown2007-09-131-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) client/mysql.cc: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysql_upgrade.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqladmin.cc: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqlbinlog.cc: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqlcheck.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqldump.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqlimport.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqlmanagerc.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear configure.in: Bug #15327: configure: --with-tcp-port option being partially ignored If MYSQL_TCP_PORT defaulted in configure (factory default 3306 at the time of this writing), set MYSQL_TCP_PORT to factory default, then clear factory default after. That way, we lose no information, and we can distinguish between "defaulted" and the pathological case "builder specifically configured a port that coincides with factory default." This can in theory happen if builder configures and builds several servers from a script (--with-tcp-port=3306, --with-tcp-port=3316, --with-tcp-port=3326). Not all that probable, but much preferable to having more "magic" happen in the server when we can solve this without any guesswork. client/mysqlshow.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqltest.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear include/mysql_version.h.in: Bug #15327: configure: --with-tcp-port option being partially ignored make factory default for TCP port available as MYSQL_PORT_DEFAULT if build-time configured with a different default. (0 if unchanged) libmysql/libmysql.c: Bug #15327: configure: --with-tcp-port option being partially ignored initialize default tcp port for client, like so: - if user configured --with-tcp-port, use that value as default - otherwise assume "use a good default": search mysqld/tcp in /etc/services; if that doesn't exist, use factory default (3306) - environment variable MYSQL_TCP_PORT overrides this default - command-line option overrides all of the above mysql-test/Makefile.am: Bug #15327: configure: --with-tcp-port option being partially ignored make factory default for TCP port available as MYSQL_TCP_PORT_DEFAULT if build-time configured with a different default. (0 if unchanged) mysql-test/mysql-test-run-shell.sh: Bug #15327: configure: --with-tcp-port option being partially ignored set up MYSQL_TCP_PORT if not already set in environment: - if user configured --with-tcp-port, use that value as default - otherwise assume "use a good default": search mysqld/tcp in /etc/services; if that doesn't exist, use factory default (3306) netware/mysql_test_run.c: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time netware/mysqld_safe.c: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time scripts/Makefile.am: Bug #15327: configure: --with-tcp-port option being partially ignored make factory default for TCP port available as MYSQL_TCP_PORT_DEFAULT if build-time configured with a different default. (0 if unchanged) scripts/mysql_config.sh: Bug #15327: configure: --with-tcp-port option being partially ignored set up MYSQL_TCP_PORT if not already set in environment: - if user configured --with-tcp-port, use that value as default - otherwise assume "use a good default": search mysqld/tcp in /etc/services; if that doesn't exist, use factory default (3306) scripts/mysql_fix_privilege_tables.sh: Bug #15327: configure: --with-tcp-port option being partially ignored clarifying notice only scripts/mysqld_safe-watch.sh: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time server-tools/instance-manager/priv.h: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time sql/mysqld.cc: Bug #15327: configure: --with-tcp-port option being partially ignored if builder specifically requested a default port, use that (even if it coincides with our factory default). only if they didn't do we check /etc/services (and, failing on that, fall back to the factory default of 3306). either default can be overridden by the environment variable MYSQL_TCP_PORT, which in turn can be overridden with command line options. tests/mysql_client_test.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear tests/ssl_test.c: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time tests/thread_test.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear
* | adjust version numberunknown2007-08-271-2/+2
| | | | | | | | | | configure.in: adjust version number after 5.0.48 clone-off
* | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-buildunknown2007-08-011-0/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/maint/50 configure.in: Auto merged
| * \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-08-011-0/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sin.intern.azundris.com:/home/tnurnberg/10776/50-10776 configure.in: Auto merged
| | * | Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2unknown2007-08-011-0/+6
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.)
* | | Generate "config.h" directly into the "include" directory, later copiedunknown2007-07-301-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge trift-lap.fambruehe:/MySQL/M50/mysql-5.0unknown2007-07-161-4/+12
|\ \ | |/ |/| | | | | | | | | | | | | | | into trift-lap.fambruehe:/MySQL/M50/push-5.0 configure.in: Auto merged sql/field.cc: Auto merged
| * Merge dev:/data0/mysqldev/my/build-200706140748-5.0.44/mysql-5.0-releaseunknown2007-06-291-4/+12
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build configure.in: Auto merged libmysql/libmysql.c: Auto merged sql/field.cc: Auto merged
| | * configure.in:unknown2007-06-201-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added --with-system-type=<systype> and --with-machine-type=<machtype> options, to be able to override the one detected, for --version strings field.cc, field.h, listener.cc: C++ compatibility change for IBM VisualAge 6 and i5/OS configure.in: Added --with-system-type=<systype> and --with-machine-type=<machtype> options, to be able to override the one detected, for --version strings server-tools/instance-manager/listener.cc: C++ compatibility change for IBM VisualAge 6 and i5/OS sql/field.cc: C++ compatibility change for IBM VisualAge 6 and i5/OS sql/field.h: C++ compatibility change for IBM VisualAge 6 and i5/OS
* | | Raise version number after cloning 5.0.46unknown2007-07-161-2/+2
|/ /
* | try again.unknown2007-06-191-2/+2
|/ | | | | configure.in: Raise version number after cloning 5.0.44
* Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-06-151-0/+6
|\ | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50 configure.in: Auto merged sql/mysqld.cc: Auto merged
| * Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-buildunknown2007-06-141-0/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50 configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/binlog.result: Auto merged mysql-test/r/have_log_bin.require: Auto merged BitKeeper/deleted/.del-ctype_cp932_notembedded.test: Auto merged mysql-test/t/binlog.test: Auto merged mysql-test/t/ctype_cp932_binlog.test: Auto merged mysql-test/t/ctype_ucs_binlog.test: Auto merged mysql-test/t/flush_block_commit_notembedded.test: Auto merged mysql-test/t/insert_select-binlog.test: Auto merged mysql-test/t/mysqlbinlog-cp932.test: Auto merged mysql-test/t/mysqldump.test: Auto merged mysql-test/t/sp_trans.test: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged mysql-test/r/mix_innodb_myisam_binlog.result: Use local mysql-test/t/blackhole.test: manual merge mysql-test/t/drop_temp_table.test: manual merge mysql-test/t/mix_innodb_myisam_binlog.test: Use local mysql-test/t/mysqlbinlog.test: Use local
| * \ Merge mysql.com:/home/kent/bk/tmp3/mysql-4.1-buildunknown2007-05-301-0/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/tmp3/mysql-5.0-build configure.in: Auto merged
| | * | Makefile.am, configure.in:unknown2007-05-301-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added --with-mysqld-libs configure flag configure.in: Added --with-mysqld-libs configure flag sql/Makefile.am: Added --with-mysqld-libs configure flag
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-06-141-7/+28
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint configure.in: Auto merged sql/mysqld.cc: Auto merged
| * | | Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maintunknown2007-06-071-0/+13
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint configure.in: Auto merged
| | * | Bug#10218 Command line recall rolls into Segmentation Fault(coredump)'unknown2007-06-041-0/+13
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Declare 'tgoto' if not already declared in system header files. cmd-line-utils/libedit/el_term.h: Declare 'tgoto' if not already declared in system header files. Failing to declare it will cause the pointer returned to be truncated to 32-bit integer which is no a valid pointer - in most cases. configure.in: Add check to see if 'tgoto' is declared in system header files
| * | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50unknown2007-05-211-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 configure.in: Auto merged mysql-test/r/strict.result: Auto merged mysql-test/r/type_datetime.result: Auto merged mysql-test/t/type_datetime.test: Auto merged sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged
| | * | Raise version number after cloning 5.0.42unknown2007-05-141-2/+2
| | | |
| * | | Fix for bug #28240: "isinf()" cannot be used in C++ for lack of prototypeunknown2007-05-161-5/+13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Since isinf() portability across various platforms and compilers is a complicated question, we should not use it directly. Instead, the my_isinf() macro should be used, which is defined as an alias to the system-defined isinf() if it is safe to use, or a workaround implementation otherwise configure.in: Added a check to define HAVE_ISINF only if it can be used in C++ code as well. include/my_global.h: Define my_isinf() as an alias to isinf(), if it is available in both C and C++ code. Otherwise, define it to a workaround implementation. sql/item_func.cc: Replaced isinf() with my_isinf(). strings/strtod.c: Replaced isinf() with my_isinf().
* | | Bug#21723: Should be able to dump core after setuid() under Linuxunknown2007-06-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In many cases, binaries can no longer dump core after calling setuid(). Where the PR_SET_DUMPABLE macro is set, use the prctl() system call to tell the kernel that it's allowed to dump the core of the server. configure.in: Test system for "sys/prctl.h", to get access to prctl(). sql/mysqld.cc: Add a process-control operation that tells the Linux kernel that it is allowed to dump core after setuid().
* | | Bug #23294: Detection of sem_xxx functions on NetBSD broken and \unknown2007-05-081-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DragonflyBSD misc patches The bug reporter anticipated a problem, instead of experiencing one. IRC conversation: <xtraeme> sem_init is defined in librt on NetBSD solaris uses libposix4 iirc that's why I sent a patch <chadmiller> xtraeme: Agreed. But, AFAICT, mysql doesn't use sem_init() anywhere. Thus my confusion. <xtraeme> I didn't verify that, but I saw that sem_init wasn't detected correctly... why are you checking for sem_init if it's unused then? :-) <chadmiller> xtraeme: In recent autoconf scripts, we change it to test for sched_yield() . <xtraeme> that's ok then sched_yield is in libc feel free to close the bug report then :-) configure.in: Remove useless test for sem_init() .
* | | Bug #23294: Detection of sem_xxx functions on NetBSD broken and \unknown2007-05-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DragonflyBSD misc patches Add the original intended test, since our current test for sched_yield is insufficient to copy. configure.in: We can't check for sched_yield, as that is in libc on FBSD. Re-add the check for sem_init in librt.
* | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community--bug23294unknown2007-05-081-2/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint configure.in: SCCS merged
| * | Bug#23294: Detection of sem_xxx functions on NetBSD broken and DragonflyBSD \unknown2006-12-121-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | misc patches Patch from community member Juan RP. "dragonfly" os name should be synonymous with netbsd and sem_* functions may also be found in librt. configure.in: Detect OS name of DragonFlyBSD. Search for semaphor functions in librt also.
* | | Merge trift-lap.fambruehe:/MySQL/M50/mysql-5.0unknown2007-04-261-22/+70
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift-lap.fambruehe:/MySQL/M50/push-5.0 configure.in: Auto merged include/Makefile.am: Auto merged
| * \ \ Merge debian.(none):/M50/bug27739-5.0unknown2007-04-201-0/+16
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into debian.(none):/M50/push-5.0 configure.in: Auto merged
| | * | | configure.in : Ensure that "icheck" is really the ABI checker,unknown2007-04-201-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not some other tool (file system checker on Tru64). Patch originally supplied by Peter O'Gorman, slightly modified by me. Bug#27739 "build fails on Tru64 due to icheck test in configure" configure.in: We use "icheck" as a tool to check against ABI changes. However, some systems (like Tru64) have "icheck" as a file system checker. So if "icheck" is found, it should be verified that this really is the ABI checker and not some other tool. Patch originally supplied by Peter O'Gorman, slightly modified by me. Bug#27739 "build fails on Tru64 due to icheck test in configure"
| * | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-buildunknown2007-04-181-2/+2
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into debian.(none):/M50/push-5.0 configure.in: Auto merged
| * | | | Cleanup: The temporary file could be left around if nothing was excluded.unknown2007-04-171-1/+1
| | | | |
| * | | | Let the "configure" options that control table handlers (NDB, InnoDB) or ↵unknown2007-04-171-22/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | features ("embedded") also control the list of man pages installed, so that they correspond better to the binaries. This is the second version of this fix, including review comments. configure.in: Several of our man pages are specific to parts (table handlers, features, ...) which are controlled by "configure" options, so there are builds which do not include these parts. For such builds, remove those specific man pages from the list of man pages to be installed, so that the man pages correspond better to the binaries. In this patch, do it for NDB (modify Kent's approach), "embedded", and InnoDB. Ensure that the handling of the man pages is determined only after the options have been processed, the old nandling (NDB only) was done too early. This is the second version of this fix, including review comments.
* | | | | Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint-debianv2unknown2007-04-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint configure.in: Auto merged
| * | | | | Fixed make distcheck problem. unknown2007-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile.am: Removed debian/control creation from the top level dist-hook configure.in: Create debian/control from configure again debian/rules: Protect debian/control from the debuild distclean run. Prevent a makefile variable loop when settin MYSQL_BASE_VERSION
* | | | | | Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint-debianv2unknown2007-04-171-1/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint configure.in: SCCS merged
| * | | | | BUG#27769 - MySQL should include debian packaging dirunknown2007-04-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced hardcoded sover reference with variable. Removed references to added manpages. --- BUG#27769 Cleaned up some things to make building the packages go a little smoother. --- debian/rules really does need to be called from the source root. --- Fixed two problems with the build caused by adding debian to the source tree --- Left off the debian/ prefix to the Makefile filter. --- BUG#27769 - MySQL should include debian packaging dir Changed substitution variables to match already existing autoconf vars. Generate debian/control and debian/defs.mk from autoconf now, since we run that to make a source package. --- Corrected incorrect variable name --- Renamed template files to have shorter names. --- Moved generation of debian/control to dist-hook so make clean won't eat it. --- A few final changes to make debs build from a source tarball dist. debian/libmysqlclientSLIB-dev.README.Maintainer.in: Rename: debian/libmysqlclientMYSOVER-dev.README.Maintainer.in -> debian/libmysqlclientSLIB-dev.README.Maintainer.in debian/libmysqlclientSLIB-dev.dirs.in: Rename: debian/libmysqlclientMYSOVER-dev.dirs.in -> debian/libmysqlclientSLIB-dev.dirs.in debian/libmysqlclientSLIB-dev.docs.in: Rename: debian/libmysqlclientMYSOVER-dev.docs.in -> debian/libmysqlclientSLIB-dev.docs.in debian/libmysqlclientSLIB-dev.examples.in: Rename: debian/libmysqlclientMYSOVER-dev.examples.in -> debian/libmysqlclientSLIB-dev.examples.in debian/libmysqlclientSLIB-dev.files.in: Rename: debian/libmysqlclientMYSOVER-dev.files.in -> debian/libmysqlclientSLIB-dev.files.in debian/libmysqlclientSLIB-dev.links.in: Rename: debian/libmysqlclientMYSOVER-dev.links.in -> debian/libmysqlclientSLIB-dev.links.in debian/libmysqlclientSLIB.README.Debian.in: Rename: debian/libmysqlclientMYSOVER.README.Debian.in -> debian/libmysqlclientSLIB.README.Debian.in debian/libmysqlclientSLIB.dirs.in: Rename: debian/libmysqlclientMYSOVER.dirs.in -> debian/libmysqlclientSLIB.dirs.in debian/libmysqlclientSLIB.docs.in: Rename: debian/libmysqlclientMYSOVER.docs.in -> debian/libmysqlclientSLIB.docs.in debian/libmysqlclientSLIB.files.in: Rename: debian/libmysqlclientMYSOVER.files.in -> debian/libmysqlclientSLIB.files.in debian/libmysqlclientSLIB.postinst.in: Rename: debian/libmysqlclientMYSOVER.postinst.in -> debian/libmysqlclientSLIB.postinst.in debian/libndbclientNLIB-dev.dirs.in: Rename: debian/libndbclientNDBSOVER-dev.dirs.in -> debian/libndbclientNLIB-dev.dirs.in debian/libndbclientNLIB-dev.files.in: Rename: debian/libndbclientNDBSOVER-dev.files.in -> debian/libndbclientNLIB-dev.files.in debian/libndbclientNLIB-dev.links.in: Rename: debian/libndbclientNDBSOVER-dev.links.in -> debian/libndbclientNLIB-dev.links.in debian/libndbclientNLIB.README.Debian.in: Rename: debian/libndbclientNDBSOVER.README.Debian.in -> debian/libndbclientNLIB.README.Debian.in debian/libndbclientNLIB.dirs.in: Rename: debian/libndbclientNDBSOVER.dirs.in -> debian/libndbclientNLIB.dirs.in debian/libndbclientNLIB.files.in: Rename: debian/libndbclientNDBSOVER.files.in -> debian/libndbclientNLIB.files.in debian/libndbclientNLIB.postinst.in: Rename: debian/libndbclientNDBSOVER.postinst.in -> debian/libndbclientNLIB.postinst.in debian/mysql-client-BASE.NEWS.in: Rename: debian/mysql-client-MYVER.NEWS.in -> debian/mysql-client-BASE.NEWS.in debian/mysql-client-BASE.README.Debian.in: Rename: debian/mysql-client-MYVER.README.Debian.in -> debian/mysql-client-BASE.README.Debian.in debian/mysql-client-BASE.dirs.in: Rename: debian/mysql-client-MYVER.dirs.in -> debian/mysql-client-BASE.dirs.in debian/mysql-client-BASE.docs.in: Rename: debian/mysql-client-MYVER.docs.in -> debian/mysql-client-BASE.docs.in debian/mysql-extra-BASE.dirs.in: Rename: debian/mysql-extra-MYVER.dirs.in -> debian/mysql-extra-BASE.dirs.in debian/mysql-extra-BASE.files.in: Rename: debian/mysql-extra-MYVER.files.in -> debian/mysql-extra-BASE.files.in debian/mysql-management-BASE.dirs.in: Rename: debian/mysql-management-MYVER.dirs.in -> debian/mysql-management-BASE.dirs.in debian/mysql-management-BASE.files.in: Rename: debian/mysql-management-MYVER.files.in -> debian/mysql-management-BASE.files.in debian/mysql-management-BASE.mysql-management.init.in: Rename: debian/mysql-management-MYVER.mysql-management.init.in -> debian/mysql-management-BASE.mysql-management.init.in debian/mysql-server-BASE.NEWS.in: Rename: debian/mysql-server-MYVER.NEWS.in -> debian/mysql-server-BASE.NEWS.in debian/mysql-server-BASE.README.Debian.in: Rename: debian/mysql-server-MYVER.README.Debian.in -> debian/mysql-server-BASE.README.Debian.in debian/mysql-server-BASE.dirs.in: Rename: debian/mysql-server-MYVER.dirs.in -> debian/mysql-server-BASE.dirs.in debian/mysql-server-BASE.docs.in: Rename: debian/mysql-server-MYVER.docs.in -> debian/mysql-server-BASE.docs.in debian/mysql-server-BASE.links.in: Rename: debian/mysql-server-MYVER.links.in -> debian/mysql-server-BASE.links.in debian/mysql-server-BASE.logcheck.ignore.paranoid.in: Rename: debian/mysql-server-MYVER.logcheck.ignore.paranoid.in -> debian/mysql-server-BASE.logcheck.ignore.paranoid.in debian/mysql-server-BASE.logcheck.ignore.server.in: Rename: debian/mysql-server-MYVER.logcheck.ignore.server.in -> debian/mysql-server-BASE.logcheck.ignore.server.in debian/mysql-server-BASE.logcheck.ignore.workstation.in: Rename: debian/mysql-server-MYVER.logcheck.ignore.workstation.in -> debian/mysql-server-BASE.logcheck.ignore.workstation.in debian/mysql-server-BASE.mysql-server.logrotate.in: Rename: debian/mysql-server-MYVER.mysql-server.logrotate.in -> debian/mysql-server-BASE.mysql-server.logrotate.in debian/mysql-server-BASE.preinst.in: Rename: debian/mysql-server-MYVER.preinst.in -> debian/mysql-server-BASE.preinst.in debian/mysql-server-BASE.prerm.in: Rename: debian/mysql-server-MYVER.prerm.in -> debian/mysql-server-BASE.prerm.in debian/mysql-server-PREV.preinst.in: Rename: debian/mysql-server-MYOLDVER.preinst.in -> debian/mysql-server-PREV.preinst.in debian/mysql-storage-BASE.dirs.in: Rename: debian/mysql-storage-MYVER.dirs.in -> debian/mysql-storage-BASE.dirs.in debian/mysql-storage-BASE.files.in: Rename: debian/mysql-storage-MYVER.files.in -> debian/mysql-storage-BASE.files.in debian/mysql-storage-BASE.mysql-storage.init.in: Rename: debian/mysql-storage-MYVER.mysql-storage.init.in -> debian/mysql-storage-BASE.mysql-storage.init.in debian/mysql-test-BASE.dirs.in: Rename: debian/mysql-test-MYVER.dirs.in -> debian/mysql-test-BASE.dirs.in debian/mysql-test-BASE.files.in: Rename: debian/mysql-test-MYVER.files.in -> debian/mysql-test-BASE.files.in debian/mysql-tools-BASE.dirs.in: Rename: debian/mysql-tools-MYVER.dirs.in -> debian/mysql-tools-BASE.dirs.in debian/mysql-tools-BASE.files.in: Rename: debian/mysql-tools-MYVER.files.in -> debian/mysql-tools-BASE.files.in Makefile.am: Moved generation of debian/control to dist-hook so make clean won't eat it. --- Need to generate the control file in the dist dir - not the source dir. configure.in: Added variables to support the generation of debian/control and debian/defs.mk from configure --- Moved generation of debian/control to dist-hook so make clean won't eat it. debian/Makefile.am: Distribute the generated control file so that debuild will work naturally. --- Broke the EXTRA_DIST line into separate lines. Added defs.mk.in --- Modified debian/Makefile to use the new shorter template file names. debian/control.in: Changed substitution variables to match already existing autoconf vars. debian/defs.mk.in: Changed substitution variables to match already existing autoconf vars. Made defs.mk.in generated from template. Persisted variables here. --- Corrected incorrect variable name debian/mysql-client-BASE.files.in: Changed substitution variables to match already existing autoconf vars. debian/mysql-client-BASE.lintian-overrides.in: Changed substitution variables to match already existing autoconf vars. debian/mysql-server-BASE.config.in: Changed substitution variables to match already existing autoconf vars. debian/mysql-server-BASE.files.in: Changed substitution variables to match already existing autoconf vars. debian/mysql-server-BASE.lintian-overrides.in: Changed substitution variables to match already existing autoconf vars. debian/mysql-server-BASE.postinst.in: Changed substitution variables to match already existing autoconf vars. debian/mysql-server-BASE.postrm.in: Changed substitution variables to match already existing autoconf vars. debian/mysql-server-BASE.templates.in: Changed substitution variables to match already existing autoconf vars. debian/po/POTFILES.in.in: Changed substitution variables to match already existing autoconf vars. debian/rules: BUG#27769 - MySQL should include debian packaging dir Replaced hardcoded sover reference with variable. Removed references to added manpages. --- Prevented the test suite from being run unless requested. --- Needed a space between ifneq and ( --- The variable substitution was stepping on the Makefile from automake. --- Left off the debian/ prefix to the Makefile filter. --- Changed substitution variables to match already existing autoconf vars. --- Save debian/defs.mk from make distclean debian/source.lintian-overrides.in: Changed substitution variables to match already existing autoconf vars.
* | | | | | Merge siva.hindu.god:/home/tsmith/m/bk/50unknown2007-04-171-2/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/home/tsmith/m/bk/maint/50 configure.in: Auto merged
| * | | | | Raise version number after cloning 5.0.40unknown2007-04-171-2/+2
| | |/ / / | |/| | |
* | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndbunknown2007-04-161-0/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint BitKeeper/deleted/.del-configure.in.rej: Auto merged configure.in: Auto merged
| * | | Adding files to support building for debian.unknown2007-04-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --- Removed reference to debian svn location of debian dir. Changed verbage of comment to appease Timothy. --- Removed added manpages that aren't appropriate for our build. --- Added debian dir to list of dist targets. Added list of files needed to be distributed in debian dir. --- Added semi-colons to fix syntax error. --- BUG#27769 MySQL should include debian packaing dir Added debian/Makefile to configure.in to support make dist. BitKeeper/deleted/.del-configure.in.rej: Delete: configure.in.rej Makefile.am: Added debian dir to list of dist targets. configure.in: Added debian/Makefile to configure.in to support make dist BitKeeper/deleted/.del-comp_err.1: Adding files to support building for debian. BitKeeper/deleted/.del-msql2mysql.1: Adding files to support building for debian. BitKeeper/deleted/.del-my_print_defaults.1: Adding files to support building for debian. BitKeeper/deleted/.del-myisam_ftdump.1: Adding files to support building for debian. BitKeeper/deleted/.del-myisamchk.1: Adding files to support building for debian. BitKeeper/deleted/.del-myisamlog.1: Adding files to support building for debian. BitKeeper/deleted/.del-myisampack.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_config.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_convert_table_format.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_explain_log.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_find_rows.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_fix_extensions.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_install_db.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_secure_installation.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_setpermission.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_tableinfo.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_waitpid.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysqlbinlog.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysqlbug.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysqlcheck.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysqldumpslow.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysqlimport.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysqlmanager.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysqltest.1: Adding files to support building for debian. BitKeeper/deleted/.del-pack_isam.1: Adding files to support building for debian. BitKeeper/deleted/.del-resolve_stack_dump.1: Adding files to support building for debian. BitKeeper/deleted/.del-resolveip.1: Adding files to support building for debian. debian/Makefile.am: Added list of files needed to be distributed in debian dir. debian/README.Maintainer: Adding files to support building for debian. --- Removed reference to debian svn location of debian dir. Changed verbage of comment to appease Timothy. debian/changelog: Adding files to support building for debian. debian/compat: Adding files to support building for debian. debian/control.in: Adding files to support building for debian. debian/copyright.more: Adding files to support building for debian. debian/copyright: Adding files to support building for debian. debian/defs.mk: Adding files to support building for debian. debian/libmysqlclientMYSOVER-dev.README.Maintainer.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER-dev.dirs.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER-dev.docs.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER-dev.examples.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER-dev.files.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER-dev.links.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER.README.Debian.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER.dirs.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER.docs.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER.files.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER.postinst.in: Adding files to support building for debian. debian/libndbclientNDBSOVER-dev.dirs.in: Adding files to support building for debian. debian/libndbclientNDBSOVER-dev.files.in: Adding files to support building for debian. debian/libndbclientNDBSOVER-dev.links.in: Adding files to support building for debian. debian/libndbclientNDBSOVER.README.Debian.in: Adding files to support building for debian. debian/libndbclientNDBSOVER.dirs.in: Adding files to support building for debian. debian/libndbclientNDBSOVER.files.in: Adding files to support building for debian. debian/libndbclientNDBSOVER.postinst.in: Adding files to support building for debian. debian/mysql-client-MYVER.NEWS.in: Adding files to support building for debian. debian/mysql-client-MYVER.README.Debian.in: Adding files to support building for debian. debian/mysql-client-MYVER.dirs.in: Adding files to support building for debian. debian/mysql-client-MYVER.docs.in: Adding files to support building for debian. debian/mysql-client-MYVER.files.in: Adding files to support building for debian. debian/mysql-client-MYVER.lintian-overrides.in: Adding files to support building for debian. debian/mysql-common.README.Debian.in: Adding files to support building for debian. debian/mysql-common.dirs.in: Adding files to support building for debian. debian/mysql-common.files.in: Adding files to support building for debian. debian/mysql-common.postrm.in: Adding files to support building for debian. debian/mysql-common.preinst.in: Adding files to support building for debian. debian/mysql-extra-MYVER.dirs.in: Adding files to support building for debian. debian/mysql-extra-MYVER.files.in: Adding files to support building for debian. debian/mysql-management-MYVER.dirs.in: Adding files to support building for debian. debian/mysql-management-MYVER.files.in: Adding files to support building for debian. debian/mysql-management-MYVER.mysql-management.init.in: Adding files to support building for debian. debian/mysql-server-MYOLDVER.preinst.in: Adding files to support building for debian. debian/mysql-server-MYVER.NEWS.in: Adding files to support building for debian. debian/mysql-server-MYVER.README.Debian.in: Adding files to support building for debian. debian/mysql-server-MYVER.config.in: Adding files to support building for debian. debian/mysql-server-MYVER.dirs.in: Adding files to support building for debian. debian/mysql-server-MYVER.docs.in: Adding files to support building for debian. debian/mysql-server-MYVER.files.in: Adding files to support building for debian. debian/mysql-server-MYVER.links.in: Adding files to support building for debian. debian/mysql-server-MYVER.lintian-overrides.in: Adding files to support building for debian. debian/mysql-server-MYVER.logcheck.ignore.paranoid.in: Adding files to support building for debian. debian/mysql-server-MYVER.logcheck.ignore.server.in: Adding files to support building for debian. debian/mysql-server-MYVER.logcheck.ignore.workstation.in: Adding files to support building for debian. debian/mysql-server-MYVER.mysql-server.logrotate.in: Adding files to support building for debian. debian/mysql-server-MYVER.postinst.in: Adding files to support building for debian. debian/mysql-server-MYVER.postrm.in: Adding files to support building for debian. debian/additions/my.cnf: Adding files to support building for debian. debian/additions/mysql-server.lintian-overrides: Adding files to support building for debian. debian/additions/ndb_mgmd.cnf: Adding files to support building for debian. debian/mysql-server-MYVER.preinst.in: Adding files to support building for debian. debian/mysql-server-MYVER.prerm.in: Adding files to support building for debian. debian/mysql-server-MYVER.templates.in: Adding files to support building for debian. debian/mysql-server.preinst.in: Adding files to support building for debian. debian/mysql-storage-MYVER.dirs.in: Adding files to support building for debian. debian/mysql-storage-MYVER.files.in: Adding files to support building for debian. debian/mysql-storage-MYVER.mysql-storage.init.in: Adding files to support building for debian. debian/mysql-test-MYVER.dirs.in: Adding files to support building for debian. debian/mysql-test-MYVER.files.in: Adding files to support building for debian. debian/mysql-tools-MYVER.dirs.in: Adding files to support building for debian. debian/mysql-tools-MYVER.files.in: Adding files to support building for debian. debian/po/POTFILES.in.in: Adding files to support building for debian. debian/po/ca.po: Adding files to support building for debian. debian/po/cs.po: Adding files to support building for debian. debian/po/da.po: Adding files to support building for debian. debian/po/de.po: Adding files to support building for debian. debian/po/es.po: Adding files to support building for debian. debian/po/eu.po: Adding files to support building for debian. debian/po/fr.po: Adding files to support building for debian. debian/po/gl.po: Adding files to support building for debian. debian/po/it.po: Adding files to support building for debian. debian/po/ja.po: Adding files to support building for debian. debian/po/nb.po: Adding files to support building for debian. debian/po/nl.po: Adding files to support building for debian. debian/po/pt.po: Adding files to support building for debian. debian/po/pt_BR.po: Adding files to support building for debian. debian/po/ro.po: Adding files to support building for debian. debian/po/ru.po: Adding files to support building for debian. debian/po/sv.po: Adding files to support building for debian. debian/po/templates.pot: Adding files to support building for debian. debian/po/tr.po: Adding files to support building for debian. debian/rules: Adding files to support building for debian. --- Added semi-colons to fix syntax error. debian/source.lintian-overrides.in: Adding files to support building for debian. debian/watch: Adding files to support building for debian.
* | | | Merge ↵unknown2007-04-111-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-36sp1 into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work configure.in: Auto merged
View Lorry Controller Status