Commit graph

106 commits

Author SHA1 Message Date
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
kent@mysql.com
3e62fcf2a6 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-25 03:00:09 +02:00
kent@mysql.com
6a5a451cfb Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-10-25 02:36:51 +02:00
kent@mysql.com
257b17ba2f Makefile.am:
Option to set environment variable MTR_BUILD_THREAD to a small
  number, from what mysql-test-run calculate port numbers that
  will not conflict with other runs with different thread num
2005-10-25 02:27:55 +02:00
kent@mysql.com
3b906e73d8 portability.h:
Corrected OpenServer ifdef test
Makefile.am:
  Added test-pl and test-force-pl targets
2005-09-29 19:37:03 +02:00
msvensson@neptunus.(none)
fbf4a5e079 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-28 11:34:53 +02:00
kent@mysql.com
095efe48a5 Makefile.am, configure.in:
Enable "make distcheck" to work
2005-09-24 15:51:45 +02:00
kent@mysql.com
0cfed79ea5 Makefile.am:
Revert to shell test script for test targets
mysqltest.c:
  Windows pclose() returns error code in low byte
mysql_config.sh:
  Remove -Xa -xstrconst from --cflags for Sun C++
2005-09-24 02:42:38 +02:00
lars@mysql.com
5fe6cbf771 Removed redundant case in Makefile.am 2005-09-02 12:20:18 +02:00
joerg@mysql.com
54e797a27d Manual merge. 2005-09-01 21:06:37 +02:00
kent@mysql.com
c019e40ff0 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-08-28 20:21:47 +02:00
kent@mysql.com
88af3ceb20 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-08-28 20:03:03 +02:00
kent@mysql.com
e2954b29a1 Makefile.am:
Make ports configurable from environment for test
2005-08-28 19:46:56 +02:00
joerg@mysql.com
d8a1c90597 Correct a typing error: Missing ".pl" suffix is essential. 2005-08-25 11:17:54 +02:00
joerg@mysql.com
c5e51b7c27 Add the "test-force" target to "Makefile.am". 2005-08-23 19:16:43 +02:00
monty@mysql.com
86d7b02199 Merge with 4.1 2005-07-03 14:17:52 +03:00
kent@mysql.com
eaec18bda6 Makefile.am:
Bug#9873, reenabled --without-man option to work
2005-06-28 04:49:03 +02:00
lenz@mysql.com
5d515df476 - reverted to using the shell version of mysql-test-run for "make test" until the
remaining bugs in the Perl version have been resolved
2005-06-23 19:03:55 +02:00
kent@mysql.com
43f8b7b43b Merge 2005-06-20 13:20:27 +02:00
kent@mysql.com
27e9a70379 Makefile.am:
Use the Perl version of mysql-test-run
2005-06-20 12:58:58 +02:00
lenz@mysql.com
8e09a3b8d1 - fixed the "test-force" target in the toplevel Makefile.am for systems on which
"." is not in the PATH...
2005-05-27 19:20:29 +02:00
serg@serg.mylan
530b6ba541 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-05-01 23:10:55 +02:00
monty@mysql.com
e721ec37ff After merge fixes 2005-04-30 18:40:08 +03:00
svoj@mysql.com
c1fd1d6a5b WL#2286 Compile MySQL w/YASSL support
yaSSL-0.9.7 library bundled.
2005-04-28 18:23:27 +05:00
brian@zim.(none)
473e1ffd3a Removed support for RAID, mit-threads, and MySQL FS (really, if someone wants this feature look at a web-dav hookup). 2005-03-16 16:22:56 -08:00
monty@mysql.com
309b1a2b6c Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
joerg@mysql.com
8311f83f06 Clean up the handling of "server" and "client" directories, while still avoiding the double listing of
common directories in 'SUBDIRS' macro ("make distclean" had failed due to that).
Solves bug#7368: "regex make error in 4.1.8"
2004-12-30 14:03:19 +01:00
monty@mishka.local
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
lenz@mysql.com
2cd30dc674 - a fix for the fix - now "make test" will run the test suite with and
without the PS protocol
2004-12-13 21:43:30 +01:00
mwagner@here.mwagner.org
bde49d08c7 Makefile.am:
s/spaces/TAB/
2004-12-13 14:03:19 -06:00
mwagner@here.mwagner.org
a20c623e6b Makefile.am:
Add running of test suite with --ps-protocol to 'test' target
2004-12-13 13:48:37 -06:00
guilhem@mysql.com
e38dae0bc1 Merge 2004-11-16 00:04:12 +01:00
tomas@poseidon.ndb.mysql.com
16e34bd27d changed compile order, mysqladmin with ndbcluster extensions needs ndb to be compiled first
added libs variable for ndbmgmclient used by mysqladmin
    add linkage with @ndb_mgmclient_libs@
    additional options for ndbcluster
    added support for managing the cluster to mysqladmin
    added DEFINE_CXA_PURE_VIRTUAL flag to CFLAGS to enable linkage with c++ libs
    use macros for C_MODE_START/END so that define of FIX_GCC_LINKING_PROBLEM works in c-programs
2004-11-15 12:40:32 +00:00
monty@mysql.com
afbe601302 merge with 4.1 2004-10-29 19:26:52 +03:00
monty@mysql.com
62f3cd6a31 Merge with 4.0 for 4.1 release
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied
2004-10-06 19:14:33 +03:00
hartmut@mysql.com
5c8eb70667 added --without-man option similar to --without-docs
(part of BUG#5379)
2004-09-26 15:27:13 +02:00
monty@mysql.com
f2829d0386 After merge fixes of merge with 4.1 that included the new arena code.
Fixed (together with Guilhem) bugs in mysqlbinlog regarding --offset
Prefix addresses with 0x for easier comparisons of debug logs
Fixed problem where MySQL choosed index-read even if there would be a much better range on the same index
This fix changed some 'index' queries to 'range' queries in the test suite
Don't create 'dummy' WHERE clause for trivial WHERE clauses where we can remove the WHERE clause.
This fix removed of a lot of 'Using where' notes in the test suite.
Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS
Give NOTE instead of WARNING for safe field-type conversions
2004-09-09 06:59:26 +03:00
serg@serg.mylan
e1237cbc53 manually merged 2004-08-18 19:57:55 +02:00
lenz@mysql.com
1097805cf2 - rename: EXCEPTIONS->EXCEPTIONS-CLIENT 2004-08-05 17:05:11 +02:00
lenz@mysql.com
26f0fdd5e8 - More changes to include the FLOSS License Exception in the
various distributions
2004-08-05 11:22:02 +02:00
konstantin@mysql.com
569d3c8488 WL#1518, "make bundled zlib usable for unix builds":
required autotools macro written and deployed in all apropriate Makefile.ams.
Use cases checked:
- linux, standard location of zlib, no ndb
- linux, standard locatoin of zlib, with ndb
- linux, non-standard location of zlib, no ndb
- hpux11, use of bundled zlib, no ndb 
The only non-checked case is non-standard location of zlib (or use of bundled
zlib) + ndb. I wasn't able to check it as ndb/ just won't compile on beasts 
like AIX52 or HPUX11, where such a check is possible. It didn't compile 
there before as these systems dont't have installed zlib, so nothing got broken ;)
2004-07-24 03:30:11 -07:00
konstantin@mysql.com
fccfcb98d5 Previous commit didn't make it (tree fix): I'd forgotten semicolon. 2004-06-24 22:47:05 +04:00
konstantin@mysql.com
a32bb3c0c4 Fix of broken 4.1 tree:
Initially my_time.c was added to sql/ link_sources target only.
As it turns out this target is sometimes not called; instead of it
make calls one hard-coded in top-level Makefile.am.
Now adding linking of my_time.c to the top-level Makefile.am
to (hopefully) cover all cases.
2004-06-24 22:33:40 +04:00
konstantin@mysql.com
efba49fd7d Fix for bug in build scripts making everything to be reconfigured
at each 'make' invocation (pushing as two devs tested that the patch is ok).
2004-06-20 03:52:05 +04:00
monty@mysql.com
f693787063 Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-05-27 02:51:28 +03:00
monty@mysql.com
833ec1653e netware files should always be in 'make dist'
use opt_net_buffer_length instead of net_buffer_length
2004-05-27 02:47:04 +03:00