summaryrefslogtreecommitdiff
path: root/Makefile.am
Commit message (Collapse)AuthorAgeFilesLines
* Minor Makefile fixes:unknown2007-10-301-6/+11
| | | | | | | | | | | | | | | | 1) Add a new top level "Makefile.am" target "make embedded-test". 2) Fix a syntax error (bad merge) in "netware/Makefile.am". Makefile.am: Add a new "make" target "embedded-test" so that it is easier to test the "embedded server" ("libmyslqd"). Make it "phony". Use it via a sub-make within "test-bt" to avoid code duplication. netware/Makefile.am: Cleanup: Macros "BUILT_SOURCES" and "CLEANFILES" should be defined only once.
* Merge solace.(none):/home/mtaylor/src/mysql/mysql-5.0-maintunknown2007-10-121-2/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint BitKeeper/deleted/.del-changelog: Auto merged BitKeeper/deleted/.del-libmysqlclientSLIB-dev.files.in: Auto merged BitKeeper/deleted/.del-mysql-client-BASE.files.in: Auto merged BitKeeper/deleted/.del-mysql-server-BASE.files.in: Auto merged configure.in: Auto merged BitKeeper/deleted/.del-mysql-test-BASE.files.in: Auto merged BitKeeper/deleted/.del-rules: Auto merged Makefile.am: Merged in removal of debian dir from 5.0-maint
| * Removed debian dir. It was a mistake to embed it in the tree in the first ↵unknown2007-10-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2007-09-271-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/make-dist-stable/mysql-5.1-build Makefile.am: Auto merged configure.in: Auto merged
| * | Makefile.am, configure.in:unknown2007-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle pstack like other optional directories Check if a directory exists relative to $srcdir Makefile.am: Handle pstack like other optional directories Check if a directory exists relative to $srcdir configure.in: Handle pstack like other optional directories Check if a directory exists relative to $srcdir pstack/Makefile.am: Handle pstack like other optional directories Check if a directory exists relative to $srcdir
* | | Merge trift-lap.fambruehe:/MySQL/M51/push-5.1unknown2007-09-271-2/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift-lap.fambruehe:/MySQL/M51/antony-5.1 Makefile.am: Auto merged configure.in: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged mysql-test/suite/funcs_1/r/innodb__datadict.result: Use most current version of test results. mysql-test/suite/funcs_1/r/memory__datadict.result: Use most current version of test results. mysql-test/suite/funcs_1/r/myisam__datadict.result: Use most current version of test results. mysql-test/suite/funcs_1/r/ndb__datadict.result: Use most current version of test results.
| * | Makefile.am:unknown2007-09-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Traditional make wants line to start with TAB Makefile.am: Traditional make wants line to start with TAB
* | | Makefile.am:unknown2007-09-261-3/+10
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 debian.(none):/M50/rowlock-5.0unknown2007-07-261-4/+1
|\ \ | |/ | | | | | | | | | | | | | | | | into debian.(none):/M51/rowlock-5.1 BitKeeper/deleted/.del-readme.txt~3: Merge rename: BitKeeper/deleted/.del-readme.txt -> BitKeeper/deleted/.del-readme.txt~3 Makefile.am: Manual merge: "row_lock" suite is deleted.
| * Remove the "row_lock" suite from the sources.unknown2007-07-261-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For more information, see WL#3866 and the bugs numbered 28685 and 20390. BitKeeper/deleted/.del-readme.txt: Delete: mysql-test/suite/row_lock/readme.txt BitKeeper/deleted/.del-summary_of_sel_test.txt: Delete: mysql-test/suite/row_lock/summary_of_sel_test.txt BitKeeper/deleted/.del-innodb_row_lock_1.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_1.result BitKeeper/deleted/.del-innodb_row_lock_2.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_2.result BitKeeper/deleted/.del-innodb_row_lock_3.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_3.result BitKeeper/deleted/.del-innodb_row_lock_4.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_4.result BitKeeper/deleted/.del-innodb_row_lock_5.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_5.result BitKeeper/deleted/.del-innodb_row_lock_big_tab.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_big_tab.result BitKeeper/deleted/.del-innodb_row_lock_big_tab_1.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_1.result BitKeeper/deleted/.del-innodb_row_lock_big_tab_2.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_2.result BitKeeper/deleted/.del-innodb_row_lock_trig_1.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_trig_1.result BitKeeper/deleted/.del-innodb_row_lock_trig_2.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_trig_2.result BitKeeper/deleted/.del-innodb_row_lock_view_1.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_1.result BitKeeper/deleted/.del-row_lock.inc: Delete: mysql-test/suite/row_lock/include/row_lock.inc BitKeeper/deleted/.del-row_lock_big_tab.inc: Delete: mysql-test/suite/row_lock/include/row_lock_big_tab.inc BitKeeper/deleted/.del-row_lock_big_tab_1.inc: Delete: mysql-test/suite/row_lock/include/row_lock_big_tab_1.inc BitKeeper/deleted/.del-row_lock_big_tab_2.inc: Delete: mysql-test/suite/row_lock/include/row_lock_big_tab_2.inc BitKeeper/deleted/.del-row_lock_trig.inc: Delete: mysql-test/suite/row_lock/include/row_lock_trig.inc BitKeeper/deleted/.del-row_lock_view.inc: Delete: mysql-test/suite/row_lock/include/row_lock_view.inc BitKeeper/deleted/.del-row_lock_view_mix.inc: Delete: mysql-test/suite/row_lock/include/row_lock_view_mix.inc BitKeeper/deleted/.del-row_lock_view_storedp.inc: Delete: mysql-test/suite/row_lock/include/row_lock_view_storedp.inc BitKeeper/deleted/.del-row_lock_view_trig.inc: Delete: mysql-test/suite/row_lock/include/row_lock_view_trig.inc BitKeeper/deleted/.del-innodb_row_lock_view_2.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_2.result BitKeeper/deleted/.del-innodb_row_lock_view_mix_1.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_1.result BitKeeper/deleted/.del-innodb_row_lock_view_mix_2.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_2.result BitKeeper/deleted/.del-innodb_row_lock_view_storedp_1.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_1.result BitKeeper/deleted/.del-innodb_row_lock_view_storedp_2.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_2.result BitKeeper/deleted/.del-innodb_row_lock_view_trig_1.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_1.result BitKeeper/deleted/.del-innodb_row_lock_view_trig_2.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_2.result BitKeeper/deleted/.del-ndb_row_lock_1.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_1.result BitKeeper/deleted/.del-ndb_row_lock_2.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_2.result BitKeeper/deleted/.del-ndb_row_lock_3.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_3.result BitKeeper/deleted/.del-ndb_row_lock_4.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_4.result BitKeeper/deleted/.del-ndb_row_lock_5.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_5.result BitKeeper/deleted/.del-ndb_row_lock_big_tab.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_big_tab.result BitKeeper/deleted/.del-ndb_row_lock_big_tab_1.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_1.result BitKeeper/deleted/.del-ndb_row_lock_big_tab_2.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_2.result BitKeeper/deleted/.del-ndb_row_lock_trig_1.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_trig_1.result BitKeeper/deleted/.del-ndb_row_lock_trig_2.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_trig_2.result BitKeeper/deleted/.del-ndb_row_lock_view_1.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_1.result BitKeeper/deleted/.del-ndb_row_lock_view_2.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_2.result BitKeeper/deleted/.del-innodb_row_lock_1.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_1.test BitKeeper/deleted/.del-innodb_row_lock_2.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_2.test BitKeeper/deleted/.del-innodb_row_lock_3.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_3.test BitKeeper/deleted/.del-innodb_row_lock_4.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_4.test BitKeeper/deleted/.del-innodb_row_lock_5.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_5.test BitKeeper/deleted/.del-innodb_row_lock_big_tab.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_big_tab.test BitKeeper/deleted/.del-innodb_row_lock_big_tab_1.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_1.test BitKeeper/deleted/.del-innodb_row_lock_big_tab_2.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_2.test BitKeeper/deleted/.del-innodb_row_lock_trig_1.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_trig_1.test BitKeeper/deleted/.del-innodb_row_lock_trig_2.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_trig_2.test BitKeeper/deleted/.del-innodb_row_lock_view_1.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_1.test BitKeeper/deleted/.del-innodb_row_lock_view_2.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_2.test BitKeeper/deleted/.del-innodb_row_lock_view_mix_1.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_1.test BitKeeper/deleted/.del-ndb_row_lock_view_mix_1.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_1.result BitKeeper/deleted/.del-ndb_row_lock_view_mix_2.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_2.result BitKeeper/deleted/.del-ndb_row_lock_view_storedp_1.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_1.result BitKeeper/deleted/.del-ndb_row_lock_view_storedp_2.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_2.result BitKeeper/deleted/.del-ndb_row_lock_view_trig_1.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_1.result BitKeeper/deleted/.del-ndb_row_lock_view_trig_2.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_2.result BitKeeper/deleted/.del-innodb_row_lock_view_mix_2.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_2.test BitKeeper/deleted/.del-innodb_row_lock_view_storedp_1.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_1.test BitKeeper/deleted/.del-innodb_row_lock_view_storedp_2.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_2.test BitKeeper/deleted/.del-innodb_row_lock_view_trig_1.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_1.test BitKeeper/deleted/.del-innodb_row_lock_view_trig_2.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_2.test BitKeeper/deleted/.del-ndb_row_lock_1.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_1.test BitKeeper/deleted/.del-ndb_row_lock_2.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_2.test BitKeeper/deleted/.del-ndb_row_lock_3.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_3.test BitKeeper/deleted/.del-ndb_row_lock_4.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_4.test BitKeeper/deleted/.del-ndb_row_lock_5.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_5.test BitKeeper/deleted/.del-ndb_row_lock_big_tab.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_big_tab.test BitKeeper/deleted/.del-ndb_row_lock_big_tab_1.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_1.test BitKeeper/deleted/.del-ndb_row_lock_big_tab_2.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_2.test BitKeeper/deleted/.del-ndb_row_lock_trig_1.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_trig_1.test BitKeeper/deleted/.del-ndb_row_lock_trig_2.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_trig_2.test BitKeeper/deleted/.del-ndb_row_lock_view_1.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_1.test BitKeeper/deleted/.del-ndb_row_lock_view_2.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_2.test BitKeeper/deleted/.del-ndb_row_lock_view_mix_1.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_1.test BitKeeper/deleted/.del-ndb_row_lock_view_mix_2.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_2.test BitKeeper/deleted/.del-ndb_row_lock_view_storedp_1.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_1.test BitKeeper/deleted/.del-ndb_row_lock_view_storedp_2.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_2.test BitKeeper/deleted/.del-ndb_row_lock_view_trig_1.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_1.test BitKeeper/deleted/.del-ndb_row_lock_view_trig_2.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_2.test Makefile.am: Remove the "row_lock" suite from the "test-bt" target. Also, a formatting change: empty line for better readability.
* | Additional tests checking for symptoms observed withinunknown2007-07-131-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug28309 First insert violates unique constraint - was "memory" table empty ? --- Add missing phony targets Makefile.am: Add execution of the ddl stress tests. (modified) test-bt: Short running variant added (new) test-ext-stress: Longer running variant (modified) test-ext: test-ext-stress added (modified) test-fast: Short running variant with MyISAM only added --- Declare test-ext-jp and test-ext-stress to PHONY make targets. mysql-test/suite/stress/include/ddl.cln: Script for cleanup at execution end mysql-test/suite/stress/include/ddl.pre: Script for general preparations at execution start mysql-test/suite/stress/include/ddl1.inc: ddl stress script mysql-test/suite/stress/include/ddl2.inc: ddl stress script mysql-test/suite/stress/include/ddl3.inc: ddl stress script mysql-test/suite/stress/include/ddl4.inc: ddl stress script mysql-test/suite/stress/include/ddl5.inc: ddl stress script mysql-test/suite/stress/include/ddl6.inc: ddl stress script mysql-test/suite/stress/include/ddl7.inc: ddl stress script mysql-test/suite/stress/include/ddl8.inc: ddl stress script mysql-test/suite/stress/r/ddl_archive.result: File with expected results mysql-test/suite/stress/r/ddl_csv.result: File with expected results mysql-test/suite/stress/r/ddl_innodb.result: File with expected results mysql-test/suite/stress/r/ddl_memory.result: File with expected results mysql-test/suite/stress/r/ddl_myisam.result: File with expected results mysql-test/suite/stress/r/ddl_ndb.result: File with expected results mysql-test/suite/stress/t/ddl_archive.test: Storage engine specific toplevel testscript mysql-test/suite/stress/t/ddl_csv.test: Storage engine specific toplevel testscript mysql-test/suite/stress/t/ddl_innodb.test: Storage engine specific toplevel testscript mysql-test/suite/stress/t/ddl_memory.test: Storage engine specific toplevel testscript mysql-test/suite/stress/t/ddl_myisam.test: Storage engine specific toplevel testscript mysql-test/suite/stress/t/ddl_ndb.test: Storage engine specific toplevel testscript
* | Merge trift2.:/MySQL/M50/push-5.0unknown2007-06-221-0/+8
|\ \ | |/ | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1 Makefile.am: Manual merge.
| * Add the "nist" suite to the "test-bt" target,unknown2007-06-221-0/+8
| | | | | | | | | | | | | | to be run only if it is available on the machine.
* | Makefile.am : Bypass bug#28685 and skip the "rowlock" suite in the release ↵unknown2007-05-251-2/+4
| | | | | | | | | | | | | | builds. Makefile.am: Bypass bug#28685 and skip the "rowlock" suite in the release builds.
* | Makefile.am : Add "embedded" tests to the "test-bt" target.unknown2007-05-241-0/+5
| | | | | | | | | | | | Makefile.am: The "test-bt" target was lacking "embedded" tests - add them, dependent on the build of the test binary needed for them.
* | Merge trift2.:/MySQL/M50/bug26609-5.0unknown2007-05-221-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/bug26609-5.1 Makefile.am: Manual merge: Include the "row_lock" suite in the "test-bt" target. scripts/make_binary_distribution.sh: Manual merge: Include the additional test suites in the binary package.
| * Add the "row_lock" test suite to the (to be) release build test run.unknown2007-05-221-0/+2
| |
* | Prevent the failing "jp" suite from causing havoc in release builds (28563).unknown2007-05-211-2/+4
| | | | | | | | | | | | Makefile.am: This is *no* fix, it is just to avoid the failure of the "jp" test suite (28563 is the number of the bug) from causing havoc in release builds.
* | Correcting the 'partitions' suite name to its 'short' version - 'parts' in ↵unknown2007-05-091-2/+2
| | | | | | | | | | | | | | the Makefile.am file Makefile.am: Correcting the 'partitions' suite name to its 'short' version - 'parts'
* | Added additional QA functional test suites to the test-bt section in the ↵unknown2007-05-081-0/+6
| | | | | | | | | | | | | | Makefile.am file Makefile.am: Added additional QA functional test suites to the test-bt section
* | Merge trift-lap.fambruehe:/MySQL/M50/push-5.0unknown2007-04-261-0/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift-lap.fambruehe:/MySQL/M51/push-5.1 mysql-test/Makefile.am: Auto merged scripts/mysql_install_db.sh: Auto merged scripts/mysql_system_tables.sql: Auto merged scripts/mysql_system_tables_data.sql: Auto merged sql/item_subselect.h: Auto merged storage/ndb/include/ndbapi/Ndb.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/test/ndbapi/testScanFilter.cpp: Auto merged BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547: No need to propagate 5.0 changes into a 5.1 file which is deleted anyway. Makefile.am: Add "funcs_1" and "funcs_2" to the 5.1 version of the "test-bt" target. storage/ndb/src/ndbapi/NdbImpl.hpp: Manual merge from 5.0.40
| * Merge trift-lap.fambruehe:/MySQL/M50/clone-5.0unknown2007-04-261-0/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift-lap.fambruehe:/MySQL/M50/push-5.0 Makefile.am: Auto merged scripts/mysql_install_db.sh: Auto merged scripts/mysql_system_tables.sql: Auto merged scripts/mysql_system_tables_data.sql: Auto merged sql/item_subselect.h: Auto merged ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Manual merge: Use the symbolic constant. ndb/test/ndbapi/testScanFilter.cpp: Manual merge: Use the standard text.
| | * Added funcs_1 and funcs_2 to the test-bt optionunknown2007-04-171-0/+4
| | |
* | | Only list "scripts" once in SUBDIRSunknown2007-04-231-2/+2
| | |
* | | Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maintunknown2007-04-181-2/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint Makefile.am: Auto merged configure.in: Auto merged
| * | | Fixed make distcheck problem. unknown2007-04-181-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 bk-internal:/home/bk/mysql-5.1-new-maintunknown2007-04-181-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint BitKeeper/etc/ignore: auto-union Makefile.am: Auto merged
| * \ \ \ Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintunknown2007-04-181-2/+2
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint BitKeeper/etc/ignore: auto-union scripts/Makefile.am: Auto merged sql/mysql_priv.h: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~1: Auto merged client/mysql_upgrade.c: Use remote mysql-test/r/mysql_upgrade.result: Use remote Makefile.am: Merge "build scripts/ a little earlier" include/my_global.h: Merge
| | * | | Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgradeunknown2007-04-181-2/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint BitKeeper/etc/ignore: auto-union CMakeLists.txt: Auto merged Makefile.am: Auto merged include/my_global.h: Auto merged sql/mysql_priv.h: Auto merged
| | | * | | Bug#25452 mysql_upgrade access deniedunknown2007-04-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Improve mysql_upgrade and add comments describing it's logic - Don't look for mysql and mysqlcheck randomly, use dir where mysql_upgrade was started from - Don't look for mysql_fix_privilege_tables.sql randomly, compile in the mysql_fix_privilege_tables.sql file and use that to upgrade the system tables of MySQL - Check for any unexpected error returned from runnning the mysql_fix_privilege_tables SQL - Fix bug#26639, bug#24248 and bug#25405 BitKeeper/etc/ignore: Added scripts/comp_sql scripts/mysql_fix_privilege_tables_sql.c to the ignore list CMakeLists.txt: Build files also in scripts/ Makefile.am: Build scripts/ a little earlier to make the scripts/mysql_fix_privilege_tables_sql.c file available when client/ is built client/mysql_upgrade.c: Updated version of mysql_upgrade with comments and logical functions include/my_global.h: Move IF_WIN macro to my_global.h fr from sql/mysql_priv.h mysql-test/r/mysql_upgrade.result: Update result mysql-test/t/mysql_upgrade.test: Add more tests for different bugs related to mysql_upgrade scripts/Makefile.am: Build comp_sql and mysql_fix_privilege_tables_sql.c sql/mysql_priv.h: Move IF_WIN macro to my_global.h fr from sql/mysql_priv.h scripts/CMakeLists.txt: New BitKeeper file ``scripts/CMakeLists.txt'' scripts/comp_sql.c: New BitKeeper file ``scripts/comp_sql.c''
* | | | | | Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maintunknown2007-04-171-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint Makefile.am: Auto merged configure.in: Auto merged
| * | | | BUG#27769 - MySQL should include debian packaging dirunknown2007-04-171-0/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 qualinost.(none):/home/mtaylor/src/mysql-5.0-maint-debianunknown2007-04-111-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint-debian BitKeeper/deleted/.del-configure.in.rej: Auto merged Makefile.am: Added debian dir to the DIST_SUBDIRS. configure.in: Merged changes from 5.0 for adding debian dir.
| * | | Adding files to support building for debian.unknown2007-04-111-1/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --- 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 pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508unknown2007-04-111-40/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint BitKeeper/etc/ignore: auto-union Makefile.am: Auto merged configure.in: Auto merged include/Makefile.am: Auto merged libmysqld/Makefile.am: Auto merged client/Makefile.am: Merge netware/Makefile.am: Merge sql/Makefile.am: Merge
| * | | Bug#22508 BUILD/compile-dist fails due to problem with readline/libeditunknown2007-03-271-40/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move the link_sources command from top level Makefile into each subdir that need to link files BitKeeper/etc/ignore: Added libmysqld/link_sources libmysql/link_sources include/link_sources client/link_sources to the ignore list Makefile.am: Move link_sources down into each sub directory that might need it client/Makefile.am: Add "link_sources" to BUILT_SOURCES configure.in: Move link_sources down into each sub directory that might need it include/Makefile.am: Add "link_sources" to BUILT_SOURCES libmysql/Makefile.am: Add "link_sources" to BUILT_SOURCES libmysql/Makefile.shared: Add "link_sources" to BUILT_SOURCES libmysqld/Makefile.am: Add "link_sources" to BUILT_SOURCES libmysqld/examples/Makefile.am: Add "link_sources" to BUILT_SOURCES netware/Makefile.am: Add "link_sources" to BUILT_SOURCES sql/Makefile.am: Add "link_sources" to BUILT_SOURCES
* | | | Makefile.am:unknown2007-03-281-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extended test section Removed duplicate EXTRA_DIST client/Makefile.am: Removed duplicate EXTRA_DIST Makefile.am: Extended test section
* | | | Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-buildunknown2007-03-281-0/+10
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/tmp/mysql-5.1-build Makefile.am: Auto merged configure.in: Auto merged include/config-win.h: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~1: Auto merged BitKeeper/deleted/.del-README~1: Auto merged BitKeeper/deleted/.del-configure.js: Auto merged
| * | | Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-buildunknown2007-03-271-0/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/tmp/mysql-5.0-build Makefile.am: Added target for RPM debug mysql-test-run
| | * | | mysql.spec.sh, Makefile.am:unknown2007-03-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use explicit calls to mysql-test-run in spec Makefile.am: Don't use explicit calls to mysql-test-run in spec support-files/mysql.spec.sh: Don't use explicit calls to mysql-test-run in spec
| * | | | Added test options to Makefile.am includingunknown2007-03-151-4/+32
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - test suites developed by QA - additional 'fast' test options Makefile.am: Added test options to cover - test suites developed by QA - additional 'fast' test options
| * | | Makefile.am: Fix bad merge: add 'cd mysql-test' to test-ps: targetunknown2007-01-231-0/+1
| | | | | | | | | | | | | | | | | | | | Makefile.am: Fix bad merge: add 'cd mysql-test' to test-ps: target
| * | | Makefile.am: Fix previous bad merge. Re-enable the test-ps target.unknown2007-01-181-0/+1
| | | | | | | | | | | | | | | | | | | | Makefile.am: Fix previous bad merge. Re-enable the test-ps target.
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-01-111-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint include/my_global.h: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/lib/mtr_process.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/mysqladmin.test: Auto merged mysql-test/t/rpl_rotate_logs.test: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/mysqlbug.sh: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item_sum.h: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_class.h: Auto merged Makefile.am: manual merge mysql-test/t/trigger.test: manual merge strings/ctype-extra.c: manual merge
| * \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/g50unknown2006-12-261-2/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/usr/home/tim/m/bk/50 Makefile.am: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqltest.c: Auto merged include/config-win.h: Auto merged include/my_global.h: Auto merged include/my_pthread.h: Auto merged include/mysql.h: Auto merged include/typelib.h: Auto merged mysql-test/Makefile.am: Auto merged mysys/default.c: Auto merged mysys/my_wincond.c: Auto merged mysys/typelib.c: Auto merged server-tools/instance-manager/guardian.cc: Auto merged server-tools/instance-manager/instance.cc: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/net_serv.cc: Auto merged sql/opt_range.cc: Auto merged sql/share/charsets/hebrew.xml: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged strings/conf_to_src.c: Auto merged vio/viossl.c: Auto merged
* | | | | | Modifications to Makefile.am to include new test options unknown2007-03-161-4/+45
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - for including qa developed suites - for options to run 'fast' tests Makefile.am: Modifications to include new test options - for including qa developed suites - for options to run 'fast' tests
* | | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2007-01-241-8/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into weblab.(none):/home/marcsql/TREE/mysql-5.1-21029 Makefile.am: Auto merged sql/Makefile.am: Auto merged sql/sql_yacc.yy: Auto merged
| * | | | | Bug#21029 (Dependencies between sql_yacc.cc and dependent headers not detected)unknown2007-01-241-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build scripts in general, using automake, autoconf, etc, contain several special commands and work around all related to the way the bison code in the parser is built, for sql/sql_yacc.yy. These work arounds, accumulated over time during development, ultimately cause the build scripts to be unstable and cause build defects by not enforcing dependencies. This fix simplifies the build process and aligns it with the automake tooling, which provides native support for bison and *.yy files. In particular, the following problem have been fixed: - dependencies with sql_yacc.cc were not honored (Bug 21029), leading to corrupted builds, - the work around introduced by Bug 24557, to cleanup the generated files sql_yacc.h and sql_yacc.cc, has been removed, - the generated makefile, in a source distribution, used to destroy the files sql_yacc.h and sql_yacc.cc on a 'make clean' target. This has been fixed: these files are now removed by make maintainer-clean. - The root cause of the problem found with gcc 4.1 (see Bug 24619) has been clearly documented, and the "sed" hack has been replaced by a cleaner work around, when building the code with bison 1.875. - Removed the file sql/sql_yacc.yy.bak, added by WL 3031 by accident. - Removed the unnecessary AM_YFLAG= --debug introduced by WL 3432, since the compiling option DBUG_OFF takes precedence when setting YYDEBUG. BitKeeper/deleted/.del-sql_yacc.yy.bak: Rename: sql/sql_yacc.yy.bak -> BitKeeper/deleted/.del-sql_yacc.yy.bak Makefile.am: General cleanup of the build process for sql_yacc.yy sql/Makefile.am: General cleanup of the build process for sql_yacc.yy sql/sql_yacc.yy: General cleanup of the build process for sql_yacc.yy
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-01-071-7/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener Makefile.am: Auto merged configure.in: Auto merged include/mysql.h: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/lib/mtr_process.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/myisam.test: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/mysqlbug.sh: Auto merged server-tools/instance-manager/Makefile.am: Auto merged sql/event_queue.cc: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item_sum.h: Auto merged sql/opt_range.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_plugin.cc: Auto merged sql/sql_show.cc: Auto merged storage/federated/ha_federated.cc: Auto merged mysql-test/r/warnings.result: Manual merge. mysql-test/t/warnings.test: Manual merge. strings/ctype-extra.c: Manual merge.
| * | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/g51unknown2006-12-261-7/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/usr/home/tim/m/bk/tmp/mrg51-dec26 Makefile.am: Auto merged client/mysqlbinlog.cc: Auto merged configure.in: Auto merged client/mysqltest.c: Auto merged include/config-win.h: Auto merged include/my_global.h: Auto merged include/my_pthread.h: Auto merged include/mysql.h: Auto merged include/typelib.h: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/type_timestamp.result: Auto merged mysql-test/r/warnings.result: Auto merged mysys/default.c: Auto merged mysys/my_wincond.c: Auto merged mysys/typelib.c: Auto merged server-tools/instance-manager/Makefile.am: Auto merged server-tools/instance-manager/guardian.cc: Auto merged server-tools/instance-manager/instance.cc: Auto merged sql/field.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/net_serv.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/share/charsets/hebrew.xml: Auto merged sql/sql_show.cc: Auto merged storage/federated/ha_federated.cc: Auto merged strings/conf_to_src.c: Auto merged vio/viossl.c: Auto merged sql/field.h: Manual merge sql/log_event.cc: Manual merge
View Lorry Controller Status