Commit graph

258 commits

Author SHA1 Message Date
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
malff/marcsql@weblab.(none)
3ae384d04f Bug#21029 (Dependencies between sql_yacc.cc and dependent headers not detected)
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.
2007-01-24 14:40:39 -07:00
tsmith@siva.hindu.god
9d2b85c221 Makefile.am: Fix bad merge: add 'cd mysql-test' to test-ps: target 2007-01-23 10:43:21 -07:00
tsmith@siva.hindu.god
dac5bb3819 Makefile.am: Fix previous bad merge. Re-enable the test-ps target. 2007-01-18 13:15:16 -07:00
cmiller@zippy.cornsilk.net
896e2623eb Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-11 09:43:44 -05:00
cmiller@zippy.cornsilk.net
a16eaf3301 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener
2007-01-07 09:31:49 -05:00
kent@kent-amd64.(none)
58763e383e Merge mysql.com:/home/kent/bk/main/mysql-5.0
into  mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-31 01:32:21 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729 my_strtoll10-x86.s:
Corrected spelling in copyright text
Makefile.am:
  Don't update the files from BitKeeper
Many files:
  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
Many files:
  Added GPL copyright text
Removed files:
  Docs/Support/colspec-fix.pl
  Docs/Support/docbook-fixup.pl
  Docs/Support/docbook-prefix.pl
  Docs/Support/docbook-split
  Docs/Support/make-docbook
  Docs/Support/make-makefile
  Docs/Support/test-make-manual
  Docs/Support/test-make-manual-de
  Docs/Support/xwf
2006-12-31 01:02:27 +01:00
tsmith/tim@siva.hindu.god
682596d7ce Merge siva.hindu.god:/usr/home/tim/m/bk/g50
into  siva.hindu.god:/usr/home/tim/m/bk/50
2006-12-26 22:28:28 -07:00
tsmith/tim@siva.hindu.god
0cb9cee7f4 Merge siva.hindu.god:/usr/home/tim/m/bk/g51
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrg51-dec26
2006-12-26 16:49:10 -07:00
kent@kent-amd64.(none)
be15e3bc15 Merge mysql.com:/home/kent/bk/main/mysql-5.0
into  mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-23 20:20:40 +01:00
kent@mysql.com/kent-amd64.(none)
226a5c833f Many files:
Changed header to GPL version 2 only
2006-12-23 20:17:15 +01:00
tsmith/tim@siva.hindu.god
50e372d608 Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/50
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/51
2006-12-08 16:39:58 -07:00
tsmith/tim@siva.hindu.god
d54c696c24 Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/41
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/50
2006-12-08 16:26:41 -07:00
tsmith/tim@siva.hindu.god
a58d08513b Makefile.am
- test* targets are identical (as much as possible) to 5.0 & 5.1 versions
    - use @PERL@ ./mysql-test-run.pl, instead of depending on /usr/bin/perl location
    - PHONY: target includes all test targets
2006-12-08 16:17:46 -07:00
msvensson@neptunus.(none)
128b73fc36 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-04 19:28:38 +01:00
msvensson@neptunus.(none)
33c248eee5 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-12-04 19:06:42 +01:00
kent@kent-amd64.(none)
2b5e2230bb Merge mysql.com:/home/kent/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/mysql-5.1-build
2006-12-02 23:22:53 +01:00
kent@mysql.com/kent-amd64.(none)
d72b71ef9f mysql_install_db.sh:
If --srcdir and --windows is given, check if error message file
  is in source or build tree (bug#24557)
Makefile.am:
  Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)
mysql_install_db.sh:
  Added --srcdir=DIR option, used from top Makefile.am in dist-hook
  target, to find "fill_help_tables.sql" in VPATH build (bug#24557)
Makefile.am:
  Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
  the source and build tree.
  Call "mysql_install_db" with new option --srcdir, to enable the script
  to find all that is needed, if source and build directory is not the same
  (bug#24557)
2006-12-02 23:16:47 +01:00
df@kahlann.erinye.com
4e76f699b2 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
2006-12-01 10:20:23 +01:00
monty@narttu.mysql.fi
2e8d2e3ef9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-11-29 22:54:11 +02:00
monty@mysql.com/narttu.mysql.fi
23263db66e Added back sql-bench directory, so that one can more easily run benchmarks on a server and add new benchmarks for new optimizations
Fixed memory leak in _db_set() (Bug#24497 Valgrind warning: get_one_option)
Don't call net_clear() on COM_QUIT. This avoids a warning from net_clear() after shutdown: "skipped ## bytes from file"
BUG#21428: skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
2006-11-29 22:51:09 +02:00
kent@kent-amd64.(none)
4ed32e0448 Merge mysql.com:/home/kent/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/mysql-5.1-build
2006-11-29 20:25:20 +01:00
kent@mysql.com/kent-amd64.(none)
cae575a390 Merge mysql.com:/home/kent/bk/mysql-4.1-build
into  mysql.com:/home/kent/bk/mysql-5.0-build
2006-11-29 20:24:41 +01:00
kent@mysql.com/kent-amd64.(none)
3643b3689f Makefile.am:
Remove soft links before creating source TAR, to avoid file copies (bug#11865)
2006-11-29 20:22:58 +01:00
kent@kent-amd64.(none)
e5ebcd1653 Merge mysql.com:/home/kent/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/mysql-5.1-build
2006-11-29 19:42:19 +01:00
kent@mysql.com/kent-amd64.(none)
c048bf11ab Makefile.am:
Corrected change to create "win" directory
2006-11-29 19:41:48 +01:00
kent@kent-amd64.(none)
ffe9fcf123 Merge mysql.com:/home/kent/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/mysql-5.1-build
2006-11-29 19:37:59 +01:00
kent@mysql.com/kent-amd64.(none)
43eba545f3 Makefile.am:
"make distcheck" fix, "win" directory
2006-11-29 19:35:40 +01:00
msvensson@neptunus.(none)
cc747a02b3 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-28 21:11:05 +01:00
msvensson@neptunus.(none)
04d5a42bbf Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-28 20:59:57 +01:00
gkodinov/kgeorge@macbook.gmz
de08856720 fix for the merge of --mem support in autopush.pl in 5.1-opt 2006-11-20 13:42:22 +02:00
holyfoot/hf@mysql.com/deer.(none)
e95e23b0f3 Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/home/hf/work/mysql-5.0-0mrg
2006-11-17 10:30:16 +04:00
holyfoot/hf@mysql.com/deer.(none)
e7cde72651 merging 2006-11-16 23:00:48 +04:00
msvensson@neptunus.(none)
0b60b7d59a Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-13 19:19:02 +01:00
msvensson@neptunus.(none)
e09df84aa5 Remove test-force-pl-mem and add test-force-mem 2006-11-13 19:16:23 +01:00
gkodinov/kgeorge@macbook.gmz
eb1a8fcd3c Merge macbook.gmz:/Users/kgeorge/mysql/work/mem-test-5.0-opt
into  macbook.gmz:/Users/kgeorge/mysql/work/mem-test-5.1-opt
2006-11-09 12:27:53 +02:00
gkodinov/kgeorge@macbook.gmz
1a8204f242 Merge macbook.gmz:/Users/kgeorge/mysql/work/mem-test-4.1-opt
into  macbook.gmz:/Users/kgeorge/mysql/work/mem-test-5.0-opt
2006-11-08 16:41:12 +02:00
gkodinov/kgeorge@macbook.gmz
c7866bd569 Make a new test target for autopush.pl to run memory based tests 2006-11-08 15:15:56 +02:00
msvensson@shellback.(none)
f60e544902 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-14 17:31:04 +02:00
msvensson@neptunus.(none)
3eaeeca6de Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-06 01:00:35 +02:00
msvensson@neptunus.(none)
15ffeaa093 Add target to Makefile which uses the much faster --mem switch to mysql-test-run.pl 2006-10-05 23:19:32 +02:00
scottlee@calico.site
3eaee36070 Back port change from 5.1 that adds the Windows database files to the source package.
This is needed for WiX pacakging.
2006-10-02 23:05:52 -04:00
guilhem@gbichot3.local
09c5a83416 WL#3504 "plugin actions for engines' and plugins' unit tests"
for push in 5.1 (I will inform Trudy).
Storage engines and plugins can now have unit tests to test their components; such
test must be an executable C/C++ program which name ends with '-t' and which is
obeys the mytap protocol, it must be stored in the storage engine's or plugin's
source directory (storage/<engine> or plugin/<plugin>) or any subdirectories of
this.
The top-level Makefile target "test-unit" will run all unit tests: it will scan
the engines' and plugins' directories, recursively, and execute all executable
files which name ends with '-t'."
2006-09-15 15:15:24 +02:00
lars/lthalmann@dl145j.mysql.com
1dfc84986e Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-09-11 13:34:44 +02:00
georg@lmy002.wdf.sap.corp
9d6471c33e make dist changes for Cmake build 2006-09-01 10:32:12 +02:00
aelkin/elkin@dsl-hkigw8-feaaf900-177.dhcp.inet.fi
ebaaee05e1 WL#3368 mixed format as default
Two minor fixes:
 1. to make make test executes with mixed;
 2. proper isolation of binlog_statement_insert_delayed 
    from others through reset master cleaning up binlog
    todo: adapt this technique to other restarting for binlog tests
2006-08-30 21:43:05 +03:00
kent@mysql.com/g4-2.local
b329f2c3ef Many files:
Deleted config/ac-macros/ha_berkeley.m4
  Removed more referenses to bdb
2006-08-21 15:34:29 +02:00
serg@serg.mylan
25d0962cbe change test targets to be more modular. include unit tests into make test 2006-06-14 09:12:37 +02:00
msvensson@neptunus.(none)
40bfe246a9 Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
serg@sergbook.mysql.com
506f9800bd fixes 2006-04-30 15:52:30 -04:00
acurtis@xiphis.org
53d4594cfe Merge xiphis.org:/home/antony/work2/wl3201.3
into  xiphis.org:/home/antony/work2/wl3201.merge
2006-04-24 13:36:15 -07:00
acurtis@xiphis.org
4e11a4d941 WL#3201
" Configure support for server plugins "
2006-04-13 13:49:29 -07:00
jimw@mysql.com
66c29e0f49 Merge mysql.com:/home/jimw/my/mysql-5.1-clean
into  mysql.com:/home/jimw/my/mysql-5.1-kill-sql-bench
2006-04-13 10:37:57 -07:00
jimw@mysql.com
55727ef6d0 Remove sql-bench from the server repository -- it is being maintained
in a distinct mysql-bench repository. Also add a new --benchdir option
to mysql-test-run.pl so the location of the mysql-bench repository can
be specified. The default location is adjacent to the source tree.
2006-04-13 10:34:46 -07:00
mats@mysql.com
d05769e126 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/bkroot/mysql-5.1-new
2006-04-13 17:48:53 +02:00
mats@mysql.com
0bd7349557 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/merge-mysql-5.1-wl3206
2006-04-13 13:25:58 +02:00
serg@serg.mylan
d65ccb4493 merged 2006-04-13 10:24:44 +02:00
serg@serg.mylan
601d707661 Auto merged 2006-04-12 14:14:03 +02:00
serg@serg.mylan
70c2ff34f7 fixes for 'make dist' and 'make distcheck' 2006-04-12 14:08:24 +02:00
jimw@mysql.com
276109b155 Remove old cruft from the tree: mysqltestmanager, mysql_test_run_new,
and various stuff in Docs/. Also move the certificates used for testing
into mysql-test/std_data from the top-level SSL directory (now gone).
2006-04-11 18:54:24 -07:00
msvensson@neptunus.(none)
8fe764fbb2 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-04-11 09:11:36 +02:00
brian@zim.(none)
eaf850ef5b Drop a number of OS2 specific files. 2006-04-10 17:48:19 -07:00
msvensson@neptunus.(none)
e805afde11 Step 1 in removing mysql-test-run.sh from 5.1 and up 2006-04-10 18:08:54 +02:00
mats@mysql.com
32c697806f WL#3206 (Adding unit tests):
Moving mytap library into unittest/
Adding 'test' target to make and run unit tests.
Minor fixes.
2006-04-06 17:18:12 +02:00
mats@mysql.com
9b087e7d45 WL#3206 (Adding unit tests):
Added missing mytap/t/Makefile.am and minor fix to Makefile.am
2006-04-05 09:02:36 +02:00
mats@mysql.com
02ffd18af6 WL#3206 (Add unit tests):
An implementation of the TAP framework for writing unit tests.
2006-04-04 18:16:15 +02:00
knielsen@mysql.com
ce4463a139 Add some stuff to source package needed for CMake Windows packaging. 2006-03-30 11:02:52 +02:00
knielsen@mysql.com
bc6628d27f Some changes to make it possible to build for Windows with CMake from
a normal 'make dist' source .tar.gz.
2006-03-24 22:50:56 +01:00
svoj@mysql.com
a3f445151f WL#2575 - Fulltext: Parser plugin for FTS
Manual merge.
2005-12-28 16:05:30 +04:00
lars@mysql.com
ad126d90e0 WL#1012: All changes as one single changeset.
This includes both code and test cases.
2005-12-22 06:39:02 +01:00
acurtis@xiphis.org
0f8f444b8b Change for plugin storage engine to be built after mysqld 2005-12-21 14:58:03 -08:00
jani@a193-229-222-105.elisa-laajakaista.fi
5273071265 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2005-11-23 14:57:00 +02:00
acurtis@poseidon.ndb.mysql.com
c01a3b5e5f Make storage engines "pluggable", handlerton work 2005-11-07 16:25:06 +01:00
monty@mysql.com
a6f5375cb0 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2005-11-05 01:32:55 +02:00
kent@mysql.com
4742f585b1 Merge 2005-11-04 02:17:11 +01:00
kent@mysql.com
ee0b6db191 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-11-04 01:15:35 +01:00
jani@ua141d10.elisa.omakaista.fi
3d7d8af3aa Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-11-03 15:01:04 +02:00
jani@ua141d10.elisa.omakaista.fi
b8248334d9 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2005-11-03 13:02:05 +02:00
jani@ua141d10.elisa.omakaista.fi
8243eee9db Added test-force to Makefile. 2005-11-03 11:47:54 +02:00