Commit graph

18282 commits

Author SHA1 Message Date
jimw@mysql.com
59f5252dc9 Merge mysql.com:/home/jimw/my/mysql-4.1-10435
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-09 02:30:25 -07: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
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
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
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
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
9eaf381d03 FreeBSD doesn't have /proc/cpuinfo, use sysctl to find cpu model. 2005-05-08 01:18:19 +01:00
jimw@mysql.com
d1a745b0ba Add special error message for .frm files with an un-understood version, like
those from 5.0 with new datatypes. (Bug #10435)
2005-05-07 13:57:22 -07: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
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
jimw@mysql.com
17b6789cf2 Merge 2005-05-07 08:35:55 -07:00
jimw@mysql.com
17d02c5f2a Backport fix for escaping multibyte characters. (Bug #9864) 2005-05-07 07:50:04 -07:00
antony@ltantony.mysql.com
a5e9523364 Merge ltantony.mysql.com:/usr/home/antony/work2/p4-bug9666
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1
2005-05-07 14:46:54 +01:00
antony@ltantony.mysql.com
687417be74 Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug9725
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1
2005-05-07 14:43:03 +01:00
antony@ltantony.mysql.com
1af671bf36 Bug#9666 - Can't use 'DEFAULT FALSE' for column of type bool
Fix bug by moving TRUE/FALSE in with other literals.
2005-05-07 13:51:29 +01:00
antony@ltantony.mysql.com
1ebc9e37ea Bug#9725 - "disapearing query/hang" and "unknown error" with "on duplicate key update"
INSERT IGNORE...UPDATE causes break in protocol or unknown error message.
  Fix so that protocol doesn't break by properly ignoring dups.
2005-05-07 13:31:37 +01:00
lenz@mysql.com
0190878d55 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2005-05-07 12:24:02 +02:00
lenz@mysql.com
b0196446e0 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-05-07 12:19:35 +02:00
gbichot@production.mysql.com
a1948f769c [backport of 4.1, because 4.0 autobuild now hits the same problem;
when merging just use "ul"] In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile.
2005-05-07 11:35:14 +02:00
pekka@mysql.com
8f150cc664 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2005-05-07 11:18:45 +02:00
pekka@mysql.com
8ccd11182f ndb - bug#8928 2005-05-07 10:56:03 +02:00
jimw@mysql.com
7e7ed0f6a8 Merge mysql.com:/home/jimw/my/mysql-4.1-9186
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-07 01:05:19 -07:00
jimw@mysql.com
8d2a7fb1d4 Merge mysql.com:/home/jimw/my/mysql-4.1-8648
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-07 01:04:54 -07:00
jimw@mysql.com
ef183de687 Merge mysql.com:/home/jimw/my/mysql-4.1-8497
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-07 01:00:24 -07:00
ramil@mysql.com
7217b4e9a4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/ram/work/4.1
2005-05-07 09:06:11 +05:00
lenz@mysql.com
6b10b26005 Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build
2005-05-07 01:26:10 +02:00
lenz@mysql.com
838f363eae - typo fix in BUILD/compile-dist 2005-05-07 01:25:20 +02:00
lenz@mysql.com
dd006cad21 Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build
2005-05-07 01:18:01 +02:00
lenz@mysql.com
b3d916468d - added some required CXXFLAGS to BUILD/compile-dist to allow the distribution build to pass without
unresolved symbols
2005-05-07 00:53:36 +02:00
antony@ltantony.mysql.com
91e04912cd Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1
2005-05-06 17:30:36 +01:00
antony@ltantony.mysql.com
67bcc9707f Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1
2005-05-06 16:16:05 +01:00
ramil@ram-book.(none)
bec93d485b fix for bug #4082: Integer lengths cause truncation with DISTINCT CONCAT and InnoDB 2005-05-06 20:11:01 +05:00
bar@noter.(none)
6a47698468 Bug#6611: wrong sorting order.
Adding cp1250_croatian_ci collation.
2005-05-06 20:11:00 +05:00
antony@ltantony.mysql.com
bf17b75a28 Bug#6616
MySQL server 100% CPU if FLUSH TABLES WITH READ LOCK + INSERT
  Infinite loop caused by missing update to thd version.
2005-05-06 14:42:28 +01:00
ramil@mysql.com
db3abccfa2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/ram/work/4.1
2005-05-06 18:41:42 +05:00
bar@noter.(none)
b20cac254c Bug#6505 Wrong sorting order:
latin2_croatian_ci collation was fixed.
2005-05-06 18:41:41 +05:00
rburnett@bk-internal.mysql.com
534dd73692 Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
into bk-internal.mysql.com:/users/rburnett/bug10245
2005-05-06 15:24:07 +02:00
rburnett@bk-internal.mysql.com
c95e33fadf Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
into bk-internal.mysql.com:/users/rburnett/bug9721
2005-05-06 15:10:01 +02:00
rburnett@bk-internal.mysql.com
e4523c2319 Bug #9721 net_write_timeout not used on Windows
viosocket.c:
  Use ?: syntax to simplify code for setting both timeouts
2005-05-06 15:08:10 +02:00
ramil@ram-book.(none)
e1b6b7fe36 A fix (bug #7970: CONFIG_NR_CPUS not defined for kernel header percpu.h). 2005-05-06 16:12:42 +05:00
stewart@mysql.com
a37c95d4bd Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/stewart/Documents/MySQL/4.1/ndb
2005-05-06 12:31:51 +02:00
jani@ibmlab.site
27ee605090 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into ibmlab.site:/home/my/bk/mysql-4.1
2005-05-06 13:22:56 +03:00