Commit graph

32968 commits

Author SHA1 Message Date
brian@zim.(none)
79a50551cb Adding back support for loadable engines. 2006-04-16 13:08:14 -07:00
brian@zim.(none)
3831083b15 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1
2006-04-16 08:03:15 -07:00
petr@mysql.com
d99cbca22f fix broken compile 2006-04-16 14:38:52 +04:00
brian@zim.(none)
f6f03576c6 This completes the work done in 5.0 to remove mit_pthread support (most was pulled in 5.0, but there were some pieces left in the tree) 2006-04-16 01:50:25 -07:00
brian@zim.(none)
5d1d27c016 Final patch to remove the last of the OS2 support. 2006-04-15 18:17:32 -07:00
brian@zim.(none)
53dce52086 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1
2006-04-15 08:50:56 -07:00
brian@zim.(none)
ba2502b9c3 Another long patch to remove the rest of the OS2 support. 2006-04-15 08:49:00 -07:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
5dc6310712 Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
2006-04-15 09:47:33 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
d73e985ac1 Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
2006-04-14 17:50:32 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
bd868aecbb Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
2006-04-14 17:48:27 -04:00
kent@mysql.com
8732caf2eb Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-04-14 19:54:46 +02:00
kent@mysql.com
80fd0b3dd9 libmysqld.vcproj, mysqld.vcproj:
Include "." in header search, to find #include <lex_hash.h>
2006-04-14 19:36:06 +02:00
cmiller@zippy.(none)
c7513d482f Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
2006-04-14 13:33:02 -04:00
cmiller@zippy.(none)
1d1040e1ea Hand-merged test. 2006-04-14 11:39:36 -04:00
cmiller@zippy.(none)
4671650387 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new

(With hand-merged tests.)
2006-04-14 11:38:09 -04:00
elliot@mysql.com
b532fca034 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/Users/emurphy/src/mysql/bk-clean/mysql-5.1-new
2006-04-14 10:44:36 -04:00
elliot@mysql.com
24e8ea98d6 Fixing HP-UX and AIX builds. 2006-04-14 10:36:36 -04:00
kent@mysql.com
e1926a14ea Makefile.am:
Move -lmystrings after -ldbug, to define strmov() on HP-UX
2006-04-14 15:34:04 +02:00
kent@mysql.com
34842dd295 base64.t.c:
Moved declarations to beginning of block
2006-04-14 14:59:21 +02:00
petr@mysql.com
db9cabea7d add a file to EXTRA_DIST. Should fix broken bootstrap. 2006-04-14 13:53:02 +04:00
jimw@mysql.com
6f5999e9b5 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-13 18:59:13 -07:00
jimw@mysql.com
b047dbbb1d Remove ancient version of Debian packaging files. 2006-04-13 17:18:43 -07:00
jimw@mysql.com
b1302af0d2 Merge mysql.com:/home/jimw/my/mysql-5.1-kill-sql-bench
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-13 13:28:54 -07:00
jimw@mysql.com
19b9a6c97d Remove gcc-specific additions to AM_CFLAGS in unittest Makefile.am files 2006-04-13 13:26:22 -07:00
andrey@lmy004.
36b897f4c6 update 2006-04-13 23:26:02 +03:00
jimw@mysql.com
2396a360ca Merge mysql.com:/home/jimw/my/mysql-5.1-kill-sql-bench
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-13 13:22:44 -07:00
jimw@mysql.com
4cfc378096 Clean up problem in mysql.spec caused by over-aggressive editor word-wrapping 2006-04-13 13:10:00 -07:00
jimw@mysql.com
0ed6517ab8 Fix 'make distcheck' problems with new unittest code, and a small
portability problem.
2006-04-13 13:01:57 -07:00
jimw@mysql.com
515da4679b Don't remove mysql-test/std_data/*.pem in 'make clean' 2006-04-13 12:36:14 -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
3b145bee57 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/bkroot/mysql-5.1-new
2006-04-13 18:38:40 +02:00
aelkin@mysql.com
676bcecd25 Bug#19074: rpl_row_func003 test failed
disabled for now.
2006-04-13 19:02:49 +03: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
serg@serg.mylan
3acc678101 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-04-13 15:34:39 +02:00
tomas@poseidon.ndb.mysql.com
6230cdd418 retested all disabled ndb tests in pushbuild for 5+ runs and updated disabled.def accordingly 2006-04-13 15:34:38 +02:00
tomas@poseidon.ndb.mysql.com
d878c904c2 BUG#18976 test workaround 2006-04-13 15:16:02 +02:00
tomas@poseidon.ndb.mysql.com
e24b750c23 disabled tests with accurate bug reports 2006-04-13 13:31:14 +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
tomas@poseidon.ndb.mysql.com
07753c59a0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-13 10:48:24 +02:00
serg@serg.mylan
d65ccb4493 merged 2006-04-13 10:24:44 +02:00
serg@serg.mylan
e3b9c80449 fix for distcheck 2006-04-13 09:57:51 +02:00
tomas@poseidon.ndb.mysql.com
66f745cd01 wrong ndb object used to drop event operation causing DBUG_ASSERT in shutdown/cleanup 2006-04-13 09:37:43 +02:00
jimw@mysql.com
86d6b16113 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-12 13:01:26 -07:00
mats@mysql.com
0255538591 WL#3208 (Adding TAP support):
Making it portable to non-gcc compilers by defining __attribute__
macro for non-gcc compilers.
2006-04-12 21:14:32 +02:00
petr@mysql.com
6a3bb50ce6 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-im-sort-options
2006-04-12 23:12:04 +04:00
petr@mysql.com
9ac5b32a5f cleanup: sort IM options alphabetically 2006-04-12 23:08:50 +04:00
kent@mysql.com
f07838a7f5 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-04-12 20:41:40 +02:00
kent@mysql.com
dcf3ac77c7 disabled.def:
Disabled 'rpl_deadlock_innodb', randomly failing
2006-04-12 20:38:08 +02:00
kent@mysql.com
ce6319cd21 Merge 2006-04-12 20:19:40 +02:00