Commit graph

22621 commits

Author SHA1 Message Date
dlenev@mysql.com
e7f29e1904 Manual merge of fix for bug #9913 into 5.0 tree. 2005-05-09 16:21:57 +04:00
msvensson@neptunus.(none)
1e889f3beb Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-09 12:48:32 +02:00
ramil@mysql.com
ef02e6fa4d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/ram/work/5.0
2005-05-09 15:07:29 +05:00
mwagner@ultrafly.mysql.com
6078fccbf9 Merge bk-internal:/home/bk/mysql-5.0
into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-5.0
2005-05-09 12:07:28 +02:00
mwagner@ultrafly.mysql.com
f5ba5ab024 make_binary_distribution.sh:
- Print the platform name for the build logs.
2005-05-09 12:05:13 +02:00
msvensson@neptunus.(none)
939f18a676 Merge neptunus.(none):/home/msvensson/mysql/bug10241
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-09 11:31:27 +02:00
msvensson@neptunus.(none)
ed39121c9a After review fixes 2005-05-09 11:30:20 +02:00
msvensson@neptunus.(none)
34cec09efb Merge neptunus.(none):/home/msvensson/mysql/bug10241
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-09 11:26:48 +02:00
dlenev@mysql.com
12621f349b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg9913
2005-05-09 12:18:19 +04:00
serg@sergbook.mylan
1ad41d3728 Merge bk-internal:/home/bk/mysql-4.1
into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
2005-05-09 09:53:13 +02:00
lenz@mysql.com
5cdf15a919 - added "--skip-comments" to the "mysqldump" test to avoid printing comments that include
version-dependent information (which causes test failures when running the test with a
  different version string)
2005-05-09 09:25:47 +02:00
serg@sergbook.mylan
b1edf49952 don't use tmp file for such a triviality 2005-05-09 09:24:05 +02:00
ramil@ram-book.(none)
2d21a31b60 Brian's mysqldump test modifications made on Ramil's laptop. 2005-05-09 12:21:19 +05:00
ramil@mysql.com
948ae47bc2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/ram/work/5.0
2005-05-09 12:06:42 +05:00
ramil@ram-book.(none)
1092c4d8b4 Fix for bug #9798: Rollup crash with InnoDB in setup_sum_funcs(). 2005-05-09 11:43:52 +05:00
brian@zim.(none)
8636468466 Merge 2005-05-08 16:19:06 -07:00
lenz@mysql.com
44c857ad4d Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-05-09 00:51:05 +02:00
lenz@mysql.com
1b198a78b2 - fix the range test to pass when InnoDB is note enabled (e.g. in the "-classic" build) 2005-05-09 00:47:47 +02:00
lenz@mysql.com
1145d29d9f Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2005-05-09 00:36:53 +02:00
mskold@mysql.com
b2fc830459 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-05-09 00:36:28 +02:00
lenz@mysql.com
b8a94814c9 - added cmd-line-utils/libedit/vis.h to the source distribution 2005-05-09 00:35:48 +02:00
brian@brian-akers-computer.local
a8968e337d Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
2005-05-08 14:24:43 -07:00
mwagner@ultrafly.mysql.com
c5cb8a2bfa make_binary_distribution.sh:
- Remove vendor tag from package names.
  - Map standard OS names to user-friendly versions.
2005-05-08 23:02:50 +02:00
mskold@mysql.com
9e1117c3e5 Merge 2005-05-08 22:52:55 +02:00
mskold@mysql.com
c216278ab2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-05-08 22:46:09 +02:00
mskold@mysql.com
66f881a8f6 Removed call to cond_push for empty cond 2005-05-08 22:42:40 +02:00
mskold@mysql.com
6f38bd937e Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-05-08 22:25:38 +02:00
mskold@mysql.com
4b06c68d83 Fixes to compile with icc 2005-05-08 22:16:24 +02:00
mwagner@ultrafly.mysql.com
8945bb5d1d Merge bk-internal:/home/bk/mysql-4.1
into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-4.1
2005-05-08 19:16:37 +02:00
mwagner@ultrafly.mysql.com
b0774772d9 errmsg.txt:
Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
2005-05-08 19:14:28 +02:00
georg@lmy002.wdf.sap.corp
65170a2341 Added export symbols for workaround of bugs #8317,#9637 in PHP5 2005-05-08 10:24:04 +02:00
antony@ltantony.mysql.com
11d66806fd Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-5.0
2005-05-08 01:57:13 +01:00
antony@ltantony.mysql.com
08bba8bc22 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-4.1
2005-05-08 01:51:26 +01:00
antony@ltantony.mysql.com
4c3d1f16b9 Merge ltantony.mysql.com:/usr/home/antony/work2/fixbuild-4.1
into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-5.0
2005-05-08 01:20:47 +01:00
antony@ltantony.mysql.com
9eaf381d03 FreeBSD doesn't have /proc/cpuinfo, use sysctl to find cpu model. 2005-05-08 01:18:19 +01:00
antony@ltantony.mysql.com
7a56977a79 Bug#6925
Comment/*COMMENT*/is not a separator
  Ensure that whitespace is inserted after C-style comment if required.
2005-05-08 00:13:35 +01:00
antony@ltantony.mysql.com
3dce5fa432 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-5.0
2005-05-07 22:58:09 +01:00
mskold@mysql.com
bea71274f7 Merge 2005-05-07 22:49:04 +02:00
mskold@mysql.com
89d8290eb3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-05-07 22:48:16 +02:00
mskold@mysql.com
a785052d7d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-05-07 22:44:49 +02:00
mskold@mysql.com
1eaa54a4d8 Removed double cond_push 2005-05-07 22:41:30 +02:00
mskold@mysql.com
cb8d2905aa bug#9813: Post review fixes 2005-05-07 22:04:52 +02:00
lenz@mysql.com
f09fc52bc4 - Windows compile fix for ha_blackhole.cc - use #include "mysql_priv.h" instead of
#include <mysql_priv.h>
2005-05-07 22:04:10 +02:00
brian@brian-akers-computer.local
39f4e5755d Patch for --insert-ignore 2005-05-07 09:49:39 -07:00
joerg@trift-lap.fambruehe
25cf90edbd Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into trift-lap.fambruehe:/MySQL/M50/mysql-5.0
2005-05-07 18:23:36 +02:00
joerg@trift-lap.fambruehe
84af50133b Corrections to test "sp", stored procedure "fib" (see entry 9937 in the bug DB). 2005-05-07 18:06:02 +02:00
antony@ltantony.mysql.com
4fe845e8d0 Merge 2005-05-07 16:50:22 +01:00
jimw@mysql.com
17b6789cf2 Merge 2005-05-07 08:35:55 -07:00
jimw@mysql.com
b4dcd8f4ab Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-05-07 08:26:00 -07:00
jimw@mysql.com
8c7d487ae7 Fix tests after merge 2005-05-07 08:25:59 -07:00