Commit graph

18329 commits

Author SHA1 Message Date
lenz@mysql.com
89e4e756c8 - one more build fix for zlib.lib - added libpath to the
mysql_test_run_new project files
2005-05-25 10:55:21 +02:00
lenz@mysql.com
6083014c4c - applied more changes to enable the CP932 charset on Windows
- fixed linking with zlib
2005-05-24 22:42:43 +02:00
lenz@mysql.com
4a296d4f00 - bumped up version number string to 4.1.12a 2005-05-24 15:14:21 +02:00
lenz@mysql.com
236ca3626f - added the cp932 charset support to the Windows builds 2005-05-24 14:46:28 +02:00
lenz@mysql.com
f449519a47 - Backport of the patch to fix BUG#10687 (Merge engine fails
on Windows): applied required patches on top of the 4.1.12
  release (will be published as 4.1.12a for Windows)
2005-05-24 14:30:22 +02:00
lenz@mysql.com
27ab139dfa - don't include sys.h directly in the autogenerated libedit source
files - include config.h instead (compile fix for FreeBSD and AIX
  4.3/5.2)
2005-05-13 10:04:35 +02:00
kent@mysql.com
7209906093 readline.c:
Include readline/readline.h earlier, to avoid redifinition of term.h macros on AIX 5.2
search.c:
  FreeBSD needs <sys/types.h> to get 'off_t' defined
2005-05-12 19:02:26 +02:00
lenz@mysql.com
f6593cb7d4 - added a check for "u_int32_t" to configure.in that will define
HAVE_U_INT32_T when available (needed to fix a double typedef in
  libedit)
2005-05-12 18:18:37 +02:00
lenz@mysql.com
da2206d02b Applied two patches already commited to the main tree to resolve bugs found during the build:
- removed an "#error PRAGMA" from sql/item_strfunc.h (msvensson)
 - Fixed BUG#10070 (range test failed if InnoDB is not available) (sergefp)
2005-05-10 14:44:03 +02:00
holyfoot@hf-ibm.(none)
1851a38b2f Fix for bug #10493 (SJIS fields are not correctly saved) 2005-05-10 02:15:59 +05:00
bar@noter.(none)
c783cb3d7e SUBSTR with negative argument didn't work
with multi-byte strings, length() instead
of numchars() where used in a mistake.
2005-05-09 20:55:06 +05:00
ramil@mysql.com
ac22187955 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/ram/work/mysql-4.1
2005-05-09 18:50:57 +05:00
antony@ltantony.mysql.com
ddf6225def Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
into ltantony.mysql.com:/usr/home/antony/work2/p3-bug8733
2005-05-09 14:50:56 +01:00
ramil@ram-book.(none)
8d30d30073 a fix (bug #10438: Raid stopped working because of change in atomic add detection). 2005-05-09 18:33:21 +05:00
jimw@mysql.com
fee81b6d97 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-09 06:33:20 -07:00
antony@ltantony.mysql.com
cc3bfc6ff1 Bug#8733 - server accepts malformed query (multiply mentioned distinct)
Detect conflicting options in SELECT
2005-05-09 14:31:46 +01:00
msvensson@neptunus.(none)
82e6d15be5 Fixes after review 2005-05-09 14:49:27 +02:00
jimw@mysql.com
3591b93874 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-09 05:30:11 -07:00
msvensson@neptunus.(none)
891b64fd84 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-09 12:16:59 +02:00
joreland@mysql.com
c1f04bf083 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-05-09 12:16:58 +02:00
msvensson@neptunus.(none)
939b32f564 Merge neptunus.(none):/home/msvensson/mysql/bug10241
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-09 11:31:14 +02:00
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
msvensson@neptunus.(none)
ed39121c9a After review fixes 2005-05-09 11:30:20 +02:00
msvensson@neptunus.(none)
f285a1a40e Fix check-cpu, add more recognized cpus 2005-05-09 11:26:03 +02:00
msvensson@neptunus.(none)
670eef8756 Merge neptunus.(none):/home/msvensson/mysql/bug10241
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-09 11:23:12 +02:00
joreland@mysql.com
a36b2e3953 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-05-09 11:04:34 +02:00
joreland@mysql.com
28814b66f4 bug#10142 - ndb unique index resource shortage
honor abort_option as TC now abort on 288
2005-05-09 11:03:07 +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
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
joreland@mysql.com
a91f302097 ndb - autotest
fix name of result tar ball
2005-05-08 20:23:05 +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
joreland@mysql.com
749129487e ndb - autotest
fix configs and scripts
2005-05-07 18:20:29 +02:00
jimw@mysql.com
17b6789cf2 Merge 2005-05-07 08:35:55 -07:00