jimw@mysql.com
1d9bfbf7d2
Handle decision to use mysqld-max over mysqld within mysqld_safe
...
even when --ledir option is specified. (Bug #13774 )
2005-10-31 11:15:44 -08:00
lars@mysql.com
c45c24ed3f
Fixed failure of NDB config retrieval.
...
1. Made sure that base64 string is terminated with NUL.
2. Made calculation of needed size for base64 string exact.
Added checks in test for the above two fixes.
2005-10-31 19:57:57 +01:00
reggie@fedora.(none)
27e8da7985
improved previous changeset per JimW's review
2005-10-31 13:31:07 -05:00
reggie@fedora.(none)
53089ec4e4
fix some issues with IM and long pathnames (with spaces)
2005-10-31 13:31:06 -05:00
pem@mysql.com
1137a376a7
Fixed bugs in client/mysqltest.c which made lots of "connect" commands in tests fail.
2005-10-31 19:31:05 +01:00
joerg@mysql.com
4c73ac6671
Accept any shared library for "libz", not just the static one. Bug#6584
2005-10-31 18:35:26 +01:00
pem@mysql.com
81437a7286
Removed C++-isms from client/mysqltest.c
2005-10-31 17:51:48 +01:00
andrey@lmy004.
153d4c400e
fix for bug #14381 (Key length is limited to 255 bytes on BDB)
2005-10-31 14:13:51 +01:00
ramil@mysql.com
afbd0fafd3
Check for NULLs only if we don't replace column results,
...
get real results after all checks.
(see bug #14254 : func_crypt.test fails on FreeBSD with --ps-protocol).
2005-10-31 16:28:45 +04:00
jani@ua141d10.elisa.omakaista.fi
da64397b69
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-31 12:20:54 +02:00
jani@ua141d10.elisa.omakaista.fi
44aea416f9
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-31 11:54:36 +02:00
hf@deer.(none)
5150bd8f9f
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.12839
2005-10-31 12:24:43 +04:00
msvensson@neptunus.(none)
531b847f23
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-31 09:14:58 +01:00
hf@deer.(none)
16c66d49ca
Additional fix for #12839
2005-10-31 12:05:27 +04:00
sergefp@mysql.com
3612707c71
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-oct25-test
2005-10-31 09:23:13 +03:00
sergefp@mysql.com
4ad3313cd7
BUG#14139 - Merge to 5.0
2005-10-31 09:22:33 +03:00
konstantin@mysql.com
fd3a3c2224
Minor comments.
2005-10-29 13:11:34 +04:00
jimw@mysql.com
b919b29da6
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-28 18:52:10 -07:00
jimw@mysql.com
27685c0c47
Merge mysql.com:/home/jimw/my/mysql-4.1-13811
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-28 18:43:52 -07:00
patg@krsna.patg.net
22fe31e4d4
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into krsna.patg.net:/home/patg/mysql-build/mysql-4.1
2005-10-28 18:23:23 -07:00
jimw@mysql.com
0e572ff475
Merge mysql.com:/home/jimw/my/mysql-4.1-13796
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-28 18:19:19 -07:00
sergefp@mysql.com
09a4d0c7a7
4.1->5.0 merge
2005-10-29 02:36:57 +04:00
sergefp@mysql.com
3e76aa38fa
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-oct25-test
2005-10-29 02:19:38 +04:00
evgen@moonbone.local
351ac28451
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/14138-bug-5.0-mysql
2005-10-29 02:08:40 +04:00
evgen@moonbone.local
b5d5e9a546
sql_select.cc:
...
After merge fix
2005-10-29 02:07:57 +04:00
sergefp@mysql.com
8b9bab2763
Fix for BUG#13814: in mi_pack_key(), when processing NULL value for TINYBLOB key segment,
...
do advance the source pointer over 2 bytes that specify value length.
2005-10-28 23:31:32 +04:00
paul@frost.snake.net
19544bd01c
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into frost.snake.net:/Users/paul/bk/mysql-5.0
2005-10-28 14:26:22 -05:00
evgen@moonbone.local
ddea0b44e3
Manually merged
2005-10-28 23:17:51 +04:00
sergefp@mysql.com
7be7912135
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-oct25-test
2005-10-28 22:55:02 +04:00
sergefp@mysql.com
eb57f520ba
Merge
2005-10-28 22:31:41 +04:00
sergefp@mysql.com
f220d87476
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug14139
2005-10-28 21:42:01 +04:00
jimw@mysql.com
f6995841b3
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-28 10:17:37 -07:00
jimw@mysql.com
552c208bfe
Update test with changed result after merge
2005-10-28 10:16:44 -07:00
msvensson@neptunus.(none)
06c17bac2a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 19:10:05 +02:00
msvensson@neptunus.(none)
3c696721f6
Update after merge, include libtaoint-integer.o into libtaocrypt.a
2005-10-28 17:12:30 +02:00
lenz@mysql.com
7decf21c02
- after merge fix: removed pack_isam from the RPM spec file list again
2005-10-28 16:50:52 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
2e127c9207
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-10-28 17:50:06 +03:00
aivanov@mysql.com
0156fd9424
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/alexi/dev/mysql-4.1-10511
2005-10-28 17:25:26 +04:00
aivanov@mysql.com
c807cd2e26
Fix BUG#10511: Wrong padding of UCS2 CHAR columns in
...
ON UPDATE CASCADE
2005-10-28 17:16:22 +04:00
pem@mysql.com
1eaf95d5ca
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug14256/mysql-5.0
2005-10-28 14:55:01 +02:00
msvensson@neptunus.(none)
1be4e65794
Use replace_result to mask portnumber printed from failing connect
2005-10-28 14:03:24 +02:00
bell@sanja.is.com.ua
186017b468
disabling archive_gis
2005-10-28 14:56:55 +03:00
msvensson@neptunus.(none)
74c39cc118
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 13:51:42 +02:00
bell@sanja.is.com.ua
38dec6c811
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner7-5.0
2005-10-28 14:49:02 +03:00
lenz@mysql.com
303ba37044
- added man page for the mysqlmanager in the RPM spec file list
2005-10-28 13:31:19 +02:00
evgen@moonbone.local
cc5d7c0715
Fix bug #14138 ROLLUP and PROCEDURE ANALYSE() hang server
...
Procedure analyse() redefines select's fields_list. setup_copy_fields() assumes
that fields_list is a part of all_fields_list. Because select have only
3 columns and analyse() redefines it to have 10 columns, int overrun in
setup_copy_fields() occurs and server goes to almost infinite loop.
Because fields_list used not only to send data ad fields types, it's wrong
to allow procedure redefine it. This patch separates select's fileds_list
and procedure's one. Now if procedure is present, copy of fields_list is
created in procedure_fields_list and it is used for sending data and fields.
2005-10-28 15:24:46 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
1fdee50f16
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-10-28 14:04:06 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
28cb5aefcf
NetWare specific change to use a LibC API instead of a
...
kernel function to prevent CPU hogs.
2005-10-28 14:01:00 +03:00
petr@mysql.com
27cb3d93c9
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2005-10-28 14:48:39 +04:00
petr@mysql.com
922cdfa025
fix Bug #14103 IM tests fail on SCO
2005-10-28 14:29:46 +04:00