Commit graph

45578 commits

Author SHA1 Message Date
df@pippilotta.erinye.com
fcea1c66e2 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-04-26 09:38:15 +02:00
df@pippilotta.erinye.com
d384d67af2 Two test cases didn't work without Blackhole compiled into the server. 2007-04-26 08:22:05 +02:00
df@pippilotta.erinye.com
69395833bc 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-04-25 21:48:28 +02:00
df@pippilotta.erinye.com
b353df7474 Fix test case that was broken for builds without InnoDB.
---
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-vanilla-building
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-vanilla-building
---
Fix test cases to pass for a plain ./configure && make build. This includes disabling two test cases when certain features are not present in the server. We're not losing coverage from this because these features are usually present, and disabling them here only serves the purpose to make the test cases work in the unlikely case that they aren't.
---
fixes
2007-04-25 21:33:18 +02:00
df@pippilotta.erinye.com
e0f148d5f0 Fix test case that was broken for builds without InnoDB. 2007-04-25 20:23:19 +02:00
df@pippilotta.erinye.com
0f33daac60 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-04-24 22:45:21 +02:00
df@pippilotta.erinye.com
5ac0fc32b1 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-04-24 22:37:33 +02:00
df@pippilotta.erinye.com
6992b90152 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
2007-04-24 22:34:57 +02:00
df@pippilotta.erinye.com
adf575951b restrict recently added file to GPLv2 2007-04-24 22:33:25 +02:00
df@pippilotta.erinye.com
3cea9c6967 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-27818
2007-04-24 11:51:23 +02:00
df@pippilotta.erinye.com
6e1a6c73d9 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-04-24 11:48:23 +02:00
df@pippilotta.erinye.com
211ddd4bdf Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-04-24 11:46:37 +02:00
df@pippilotta.erinye.com
f6aabc5abe Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-04-24 11:44:41 +02:00
joerg@debian.(none)
08132c7fd7 Merge debian.(none):/M50/push-5.0
into  debian.(none):/M51/push-5.1
2007-04-23 18:53:12 +02:00
joerg@debian.(none)
fd409818f6 Merge debian.(none):/M41/push-4.1
into  debian.(none):/M50/push-5.0
2007-04-23 18:46:10 +02:00
joerg@debian.(none)
b3398fbbcf Merge debian.(none):/M50/push-5.0
into  debian.(none):/M51/push-5.1
2007-04-23 18:39:09 +02:00
joerg@debian.(none)
6ffe87d02c Merge debian.(none):/M50/bug14685-5.0
into  debian.(none):/M50/push-5.0
2007-04-23 18:19:03 +02:00
joerg@debian.(none)
3f3e8e90f7 Merge debian.(none):/M51/bug14685-5.1
into  debian.(none):/M51/push-5.1
2007-04-23 18:16:48 +02:00
joerg@debian.(none)
c201a6351b Merge debian.(none):/M50/bug14685-5.0
into  debian.(none):/M51/bug14685-5.1
2007-04-23 18:12:23 +02:00
joerg@debian.(none)
4fbdddf28d dbug/dbug_analyze.c : Avoid the unresolved symbol "my_thread_global_init()"
in a build "--without-server".

Fix for bug#14685
2007-04-23 13:36:18 +02:00
joerg@debian.(none)
e791812895 Merge debian.(none):/M41/mysql-4.1
into  debian.(none):/M41/push-4.1
2007-04-23 11:36:30 +02:00
joerg@debian.(none)
9c04bfed83 Merge debian.(none):/M50/mysql-5.0
into  debian.(none):/M50/push-5.0
2007-04-23 11:31:11 +02:00
joerg@debian.(none)
94008df3e0 Merge debian.(none):/M51/mysql-5.1
into  debian.(none):/M51/push-5.1
2007-04-23 11:21:15 +02:00
df@pippilotta.erinye.com
1cde557311 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-04-23 11:18:03 +02:00
df@pippilotta.erinye.com
6dc038cb3e Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
2007-04-23 11:01:13 +02:00
df@pippilotta.erinye.com
7c2433a059 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-27701
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
2007-04-23 10:48:40 +02:00
df@pippilotta.erinye.com
02d6b57fb4 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-27701
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-04-23 10:48:36 +02:00
mjorgensen@blade09.mysql.com
121bc31b4a Merge bk-internal:/home/bk/mysql-5.0
into  blade09.mysql.com:/tmp/mmj/mysql-5.0-runtime
2007-04-21 18:36:06 +02:00
mjorgensen@blade09.mysql.com
7855ae51f0 Merge bk-internal:/home/bk/mysql-5.1
into  blade09.mysql.com:/tmp/mmj/mysql-5.1-runtime
2007-04-21 18:35:01 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
5004557953 test fixed for embedded server 2007-04-21 13:26:44 +05:00
holyfoot/hf@hfmain.(none)
381c72b80a Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-21 13:20:13 +05:00
ibabaev@bk-internal.mysql.com
c22d6fbb2b Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
2007-04-21 03:51:51 +02:00
igor@olga.mysql.com
8c85357ea3 Post-merge fix. 2007-04-20 17:47:14 -07:00
malff/marcsql@weblab.(none)
c574d95a5c manual merge 2007-04-20 17:49:07 -06:00
ibabaev@bk-internal.mysql.com
c09d1cfe92 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
2007-04-21 00:36:21 +02:00
malff/marcsql@weblab.(none)
fc36313733 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
2007-04-20 15:34:04 -06:00
malff/marcsql@weblab.(none)
2d6d8e2abe Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
2007-04-20 15:31:41 -06:00
evgen@moonbone.local
4434ff13a9 Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt
into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
2007-04-21 00:33:56 +04:00
tomas@whalegate.ndb.mysql.com
fc61036567 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
2007-04-20 19:34:49 +02:00
joerg@trift2.
bcaa5cc7e8 mysql-test/t/sp_trans_log.test : Disable it in embedded (test fails). 2007-04-20 16:54:21 +02:00
mats@romeo.(none)
f4c4de6a56 Added missing result file for rpl_critical_errors. 2007-04-20 14:08:12 +02:00
mats@romeo.(none)
ae9744f266 Adding missing result file for rpl_critical_errors. 2007-04-20 14:03:15 +02:00
gshchepa/uchum@gshchepa.loc
6c5d17ef56 Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt
into  gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt-27704
2007-04-20 16:44:50 +05:00
joerg@debian.(none)
ade0e424c0 Merge debian.(none):/M41/push-4.1
into  debian.(none):/M50/push-5.0
2007-04-20 12:35:35 +02:00
gshchepa/uchum@gshchepa.loc
4fcf1316bb Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-4.1-opt-27704
into  gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt-27704
2007-04-20 15:31:33 +05:00
joerg@debian.(none)
6ef12bb111 Merge debian.(none):/M50/mysql-5.0
into  debian.(none):/M50/push-5.0
2007-04-20 12:31:03 +02:00
joerg@debian.(none)
88d88e7f7a Merge debian.(none):/M50/bug27739-5.0
into  debian.(none):/M50/push-5.0
2007-04-20 12:25:50 +02:00
joerg@debian.(none)
a9e05f8ce5 Merge debian.(none):/M50/push-5.0
into  debian.(none):/M51/push-5.1
2007-04-20 12:15:57 +02:00
gshchepa/uchum@gshchepa.loc
f5a229b3d1 Bug#27704: incorrect comparison of rows with NULL components
Support for NULL components was incomplete for row comparison,
fixed.  Added support for abort_on_null at compare_row() like
in 5.x
2007-04-20 15:14:09 +05:00
joerg@debian.(none)
4c00b6fd26 Merge debian.(none):/M51/mysql-5.1
into  debian.(none):/M51/push-5.1
2007-04-20 11:58:56 +02:00