Commit graph

237 commits

Author SHA1 Message Date
joerg@debian.(none)
eac07f4f4b Merge debian.(none):/MySQL/M51/indent-5.1
into  debian.(none):/MySQL/M51/push-5.1
2007-12-11 20:50:09 +01:00
joerg@debian.(none)
c3d0a5c821 Merge debian.(none):/MySQL/M50/indent-5.0
into  debian.(none):/MySQL/M51/indent-5.1

Manual merge of a formatting change.
2007-12-11 20:32:38 +01:00
df@pippilotta.erinye.com
42945c7726 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-12-10 12:16:41 +01:00
joerg@trift2.
151504a3d0 Makefile.am
Makefile syntax error, comment should precede the whole target.
2007-12-07 14:46:52 +01:00
joerg@trift2.
2cf168d6aa Makefile.am
In the "test-bt" target, replace the call "$(MAKE) test-embedded" by the actions of that target.
2007-12-07 11:54:59 +01:00
tsmith/mysqldev@mysql.com/production.mysql.com
da357f723a Bug #32219: too many hosts in default grant tables 6.0.3
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.
2007-11-30 06:14:43 +01:00
df@pippilotta.erinye.com
5f21a18f48 use --builddir option for mysql_install_db 2007-11-28 17:36:28 +01:00
joerg@trift2.
37e47a080a Minor Makefile fixes:
1) Add a new top level "Makefile.am" target "make embedded-test".

2) Fix a syntax error (bad merge) in "netware/Makefile.am".
2007-10-30 20:06:49 +01:00
mtaylor@solace.(none)
f31d2ab3c8 Merge solace.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
into  solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
2007-10-12 02:18:13 -07:00
mtaylor@solace.(none)
709bb3948c Removed debian dir. It was a mistake to embed it in the tree in the first place. 2007-10-12 02:15:32 -07:00
kent@kent-amd64.(none)
ca8bb3d96f Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  mysql.com:/home/kent/bk/make-dist-stable/mysql-5.1-build
2007-09-27 21:40:07 +02:00
kent@mysql.com/kent-amd64.(none)
96b62a5c13 Makefile.am, configure.in:
Handle pstack like other optional directories
  Check if a directory exists relative to $srcdir
2007-09-27 21:39:23 +02:00
joerg@trift-lap.fambruehe
6aa39a1cf6 Merge trift-lap.fambruehe:/MySQL/M51/push-5.1
into  trift-lap.fambruehe:/MySQL/M51/antony-5.1
2007-09-27 16:51:40 +02:00
kent@mysql.com/kent-amd64.(none)
1b53e4a547 Makefile.am:
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
2007-09-26 18:47:55 +02:00
kent/mysqldev@mysql.com/production.mysql.com
2e3b140e94 Makefile.am:
Traditional make wants line to start with TAB
2007-09-01 14:51:46 +02:00
joerg@debian.(none)
25f39c08bb Merge debian.(none):/M50/rowlock-5.0
into  debian.(none):/M51/rowlock-5.1
2007-07-26 18:40:46 +02:00
joerg@debian.(none)
1e455b4c28 Remove the "row_lock" suite from the sources.
For more information, see WL#3866 and the bugs numbered 28685 and 20390.
2007-07-26 17:25:03 +02:00
mleich@three.local.lan
f1a6ad4dde Additional tests checking for symptoms observed within
Bug28309 First insert violates unique constraint - was "memory" table empty ?
---
Add missing phony targets
2007-07-13 18:32:22 +02:00
joerg@trift2.
3d0064d6a5 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-06-22 22:32:50 +02:00
joerg@trift2.
4e9d181fad Add the "nist" suite to the "test-bt" target,
to be run only if it is available on the machine.
2007-06-22 20:08:19 +02:00
joerg@trift2.
2968a25b3f Makefile.am : Bypass bug#28685 and skip the "rowlock" suite in the release builds. 2007-05-25 23:08:31 +02:00
joerg@trift2.
8592dfd90d Makefile.am : Add "embedded" tests to the "test-bt" target. 2007-05-24 15:20:06 +02:00
joerg@trift2.
49dc9c5971 Merge trift2.:/MySQL/M50/bug26609-5.0
into  trift2.:/MySQL/M51/bug26609-5.1
2007-05-22 17:51:51 +02:00
joerg@trift2.
1185004419 Add the "row_lock" test suite to the (to be) release build test run. 2007-05-22 17:21:22 +02:00
joerg@trift2.
bbae855c72 Prevent the failing "jp" suite from causing havoc in release builds (28563). 2007-05-21 20:24:34 +02:00
omer@linux.site
b6451eb06e Correcting the 'partitions' suite name to its 'short' version - 'parts' in the Makefile.am file 2007-05-09 07:58:35 -07:00
omer@linux.site
999e9e7a15 Added additional QA functional test suites to the test-bt section in the Makefile.am file 2007-05-08 16:38:34 -07:00
joerg@trift-lap.fambruehe
044f2e110e Merge trift-lap.fambruehe:/MySQL/M50/push-5.0
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
2007-04-26 17:11:33 +02:00
joerg@trift-lap.fambruehe
03f4492b5b Merge trift-lap.fambruehe:/MySQL/M50/clone-5.0
into  trift-lap.fambruehe:/MySQL/M50/push-5.0
2007-04-26 16:48:53 +02:00
msvensson@pilot.blaudden
33fcd2bcc6 Only list "scripts" once in SUBDIRS 2007-04-23 16:39:22 +02:00
mtaylor@qualinost.(none)
9625810b51 Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
2007-04-18 14:37:01 -07:00
mtaylor@qualinost.(none)
f9d8b39bc5 Fixed make distcheck problem. 2007-04-18 14:34:38 -07:00
msvensson@pilot.blaudden
f6240e374d Merge bk-internal:/home/bk/mysql-5.1-new-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-18 17:00:43 +02:00
msvensson@pilot.blaudden
01133f8e6f Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-18 14:18:55 +02:00
msvensson@pilot.blaudden
dd0d2146c3 Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-18 13:22:32 +02:00
msvensson@pilot.blaudden
20e622dcf3 Bug#25452 mysql_upgrade access denied
- 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
2007-04-18 13:21:39 +02:00
mtaylor@qualinost.(none)
c9419c608e Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
2007-04-17 21:36:32 -07:00
mtaylor@qualinost.(none)
e208ce21de BUG#27769 - MySQL should include debian packaging dir
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.
2007-04-17 18:12:43 -07:00
omer@linux.localdomain
ba8c9ab5a7 Added funcs_1 and funcs_2 to the test-bt option 2007-04-17 11:23:49 -07:00
mtaylor@qualinost.(none)
48739d15f1 Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint-debian
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint-debian
2007-04-11 16:38:37 -07:00
mtaylor@qualinost.(none)
6547960e28 Adding files to support building for debian.
---
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.
2007-04-11 16:13:09 -07:00
msvensson@pilot.blaudden
2218fafa1f Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-11 09:34:02 +02:00
kent@mysql.com/kent-amd64.(none)
7eeae6ff13 Makefile.am:
Extended test section
  Removed duplicate EXTRA_DIST
2007-03-28 23:18:43 +02:00
kent@kent-amd64.(none)
0544355385 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-28 23:08:00 +02:00
msvensson@pilot.blaudden
b554258a8e Bug#22508 BUILD/compile-dist fails due to problem with readline/libedit
- Move the link_sources command from top level Makefile into each subdir
   that need to link files
2007-03-27 23:56:48 +02:00
kent@mysql.com/kent-amd64.(none)
4ad479b891 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-27 17:51:30 +02:00
kent@mysql.com/kent-amd64.(none)
ef530348cd mysql.spec.sh, Makefile.am:
Don't use explicit calls to mysql-test-run in spec
2007-03-27 17:42:55 +02:00
omer@linux.site
23c4bc92f1 Modifications to Makefile.am to include new test options
- for including qa developed suites
 - for options to run 'fast' tests
2007-03-16 09:21:25 -07:00
omer@linux.site
c099df4b70 Added test options to Makefile.am including
- test suites developed by QA 
 - additional 'fast' test options
2007-03-15 14:28:32 -07:00
malff/marcsql@weblab.(none)
a97b3d374d Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-21029
2007-01-24 14:43:09 -07:00