summaryrefslogtreecommitdiff
path: root/Makefile.am
Commit message (Collapse)AuthorAgeFilesLines
* Merge debian.(none):/MySQL/M51/indent-5.1joerg@debian.(none)2007-12-111-40/+40
|\ | | | | | | into debian.(none):/MySQL/M51/push-5.1
| * Merge debian.(none):/MySQL/M50/indent-5.0joerg@debian.(none)2007-12-111-40/+40
| | | | | | | | | | | | into debian.(none):/MySQL/M51/indent-5.1 Manual merge of a formatting change.
* | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-builddf@pippilotta.erinye.com2007-12-101-1/+1
|\ \ | |/ |/| | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
| * Bug #32219: too many hosts in default grant tables 6.0.3tsmith/mysqldev@mysql.com/production.mysql.com2007-11-301-1/+1
| | | | | | | | | | | | | | | | | | Fix is to remove any references to the current hostname when running mysql_install_db --cross-bootstrap. (The dist-hook make target makes this call, and the resulting data directory is included in the source distribution as win/data/*.) Also, a few other clean-ups to mysql_install_db while there.
* | Makefile.amjoerg@trift2.2007-12-071-1/+1
| | | | | | | | Makefile syntax error, comment should precede the whole target.
* | Makefile.amjoerg@trift2.2007-12-071-1/+8
| | | | | | | | In the "test-bt" target, replace the call "$(MAKE) test-embedded" by the actions of that target.
* | use --builddir option for mysql_install_dbdf@pippilotta.erinye.com2007-11-281-1/+1
| |
* | Minor Makefile fixes:joerg@trift2.2007-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".
* | Merge solace.(none):/home/mtaylor/src/mysql/mysql-5.0-maintmtaylor@solace.(none)2007-10-121-2/+1
|\ \ | |/ | | | | into solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
| * Removed debian dir. It was a mistake to embed it in the tree in the first ↵mtaylor@solace.(none)2007-10-121-2/+1
| | | | | | | | place.
* | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-buildkent@kent-amd64.(none)2007-09-271-1/+1
|\ \ | | | | | | | | | into mysql.com:/home/kent/bk/make-dist-stable/mysql-5.1-build
| * | Makefile.am, configure.in:kent@mysql.com/kent-amd64.(none)2007-09-271-1/+1
| | | | | | | | | | | | | | | Handle pstack like other optional directories Check if a directory exists relative to $srcdir
* | | Merge trift-lap.fambruehe:/MySQL/M51/push-5.1joerg@trift-lap.fambruehe2007-09-271-2/+2
|\ \ \ | |/ / |/| | | | | into trift-lap.fambruehe:/MySQL/M51/antony-5.1
| * | Makefile.am:kent/mysqldev@mysql.com/production.mysql.com2007-09-011-2/+2
| | | | | | | | | | | | Traditional make wants line to start with TAB
* | | Makefile.am:kent@mysql.com/kent-amd64.(none)2007-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
* | Merge debian.(none):/M50/rowlock-5.0joerg@debian.(none)2007-07-261-4/+1
|\ \ | |/ | | | | into debian.(none):/M51/rowlock-5.1
| * Remove the "row_lock" suite from the sources.joerg@debian.(none)2007-07-261-2/+1
| | | | | | | | For more information, see WL#3866 and the bugs numbered 28685 and 20390.
* | Additional tests checking for symptoms observed withinmleich@three.local.lan2007-07-131-3/+11
| | | | | | | | | | | | Bug28309 First insert violates unique constraint - was "memory" table empty ? --- Add missing phony targets
* | Merge trift2.:/MySQL/M50/push-5.0joerg@trift2.2007-06-221-0/+8
|\ \ | |/ | | | | into trift2.:/MySQL/M51/push-5.1
| * Add the "nist" suite to the "test-bt" target,joerg@trift2.2007-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 ↵joerg@trift2.2007-05-251-2/+4
| | | | | | | | builds.
* | Makefile.am : Add "embedded" tests to the "test-bt" target.joerg@trift2.2007-05-241-0/+5
| |
* | Merge trift2.:/MySQL/M50/bug26609-5.0joerg@trift2.2007-05-221-0/+2
|\ \ | |/ | | | | into trift2.:/MySQL/M51/bug26609-5.1
| * Add the "row_lock" test suite to the (to be) release build test run.joerg@trift2.2007-05-221-0/+2
| |
* | Prevent the failing "jp" suite from causing havoc in release builds (28563).joerg@trift2.2007-05-211-2/+4
| |
* | Correcting the 'partitions' suite name to its 'short' version - 'parts' in ↵omer@linux.site2007-05-091-2/+2
| | | | | | | | the Makefile.am file
* | Added additional QA functional test suites to the test-bt section in the ↵omer@linux.site2007-05-081-0/+6
| | | | | | | | Makefile.am file
* | Merge trift-lap.fambruehe:/MySQL/M50/push-5.0joerg@trift-lap.fambruehe2007-04-261-0/+4
|\ \ | |/ | | | | into trift-lap.fambruehe:/MySQL/M51/push-5.1
| * Merge trift-lap.fambruehe:/MySQL/M50/clone-5.0joerg@trift-lap.fambruehe2007-04-261-0/+4
| |\ | | | | | | | | | into trift-lap.fambruehe:/MySQL/M50/push-5.0
| | * Added funcs_1 and funcs_2 to the test-bt optionomer@linux.localdomain2007-04-171-0/+4
| | |
* | | Only list "scripts" once in SUBDIRSmsvensson@pilot.blaudden2007-04-231-2/+2
| | |
* | | Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maintmtaylor@qualinost.(none)2007-04-181-2/+0
|\ \ \ | | | | | | | | | | | | into qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
| * | | Fixed make distcheck problem. mtaylor@qualinost.(none)2007-04-181-2/+0
| | | |
* | | | Merge bk-internal:/home/bk/mysql-5.1-new-maintmsvensson@pilot.blaudden2007-04-181-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| * \ \ \ Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-04-181-2/+2
| |\ \ \ \ | | | |/ / | | |/| | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| | * | | Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrademsvensson@pilot.blaudden2007-04-181-2/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| | | * | | Bug#25452 mysql_upgrade access deniedmsvensson@pilot.blaudden2007-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
* | | | | | Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maintmtaylor@qualinost.(none)2007-04-171-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | into qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
| * | | | BUG#27769 - MySQL should include debian packaging dirmtaylor@qualinost.(none)2007-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.
* | | | Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint-debianmtaylor@qualinost.(none)2007-04-111-1/+1
|\ \ \ \ | |/ / / | | | | | | | | into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint-debian
| * | | Adding files to support building for debian.mtaylor@qualinost.(none)2007-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.
* | | Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508msvensson@pilot.blaudden2007-04-111-40/+0
|\ \ \ | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| * | | Bug#22508 BUILD/compile-dist fails due to problem with readline/libeditmsvensson@pilot.blaudden2007-03-271-40/+0
| | | | | | | | | | | | | | | | | | | | - Move the link_sources command from top level Makefile into each subdir that need to link files
* | | | Makefile.am:kent@mysql.com/kent-amd64.(none)2007-03-281-3/+15
| | | | | | | | | | | | | | | | | | | | Extended test section Removed duplicate EXTRA_DIST
* | | | Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-buildkent@kent-amd64.(none)2007-03-281-0/+10
|\ \ \ \ | | |/ / | |/| | | | | | into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
| * | | Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-buildkent@mysql.com/kent-amd64.(none)2007-03-271-0/+10
| |\ \ \ | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
| | * | | mysql.spec.sh, Makefile.am:kent@mysql.com/kent-amd64.(none)2007-03-271-0/+6
| | | | | | | | | | | | | | | | | | | | Don't use explicit calls to mysql-test-run in spec
| * | | | Added test options to Makefile.am includingomer@linux.site2007-03-151-4/+32
| | |_|/ | |/| | | | | | | | | | | | | | - test suites developed by QA - additional 'fast' test options
| * | | Makefile.am: Fix bad merge: add 'cd mysql-test' to test-ps: targettsmith@siva.hindu.god2007-01-231-0/+1
| | | |
| * | | Makefile.am: Fix previous bad merge. Re-enable the test-ps target.tsmith@siva.hindu.god2007-01-181-0/+1
| | | |
View Lorry Controller Status