kent@mysql.com
706a0dbc37
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-17 03:35:55 +01:00
dean@mysql.com
4e46b2ab50
Merge
2005-02-16 20:08:56 -06:00
kent@mysql.com
ba927fdb4c
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-17 03:04:28 +01:00
kent@mysql.com
75ebab7861
Windows compatibility changes of the 'rpl_delete_all',
...
'ps_1general' and 'fulltext_cache' test cases.
2005-02-17 02:59:39 +01:00
petr@mysql.com
a5e6d39919
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-02-17 04:19:47 +03:00
petr@mysql.com
c3b399e3bc
Fix a typo caused bdb to be skipped when building with BUILD/compile-*-max
...
Recommited, as I made a typo in the previous patch myself =)
2005-02-17 04:18:49 +03:00
kent@mysql.com
75b0b945ca
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-17 02:11:03 +01:00
dean@mysql.com
2f7595ea84
Merge mysql.com:/home/dellis/bkl/bug-4.1
...
into mysql.com:/home/dellis/bkl/bug-5.0
2005-02-16 17:35:00 -06:00
guilhem@mysql.com
877304c0ee
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0-xa
2005-02-17 00:06:09 +01:00
guilhem@mysql.com
18ecaae189
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0-xa
2005-02-16 23:27:20 +01:00
guilhem@mysql.com
f314564451
Fixes after 4.1->5.0 merge.
2005-02-16 23:23:20 +01:00
serg@serg.mylan
f795c787cd
Merge serg@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-16 22:59:17 +01:00
pekka@mysql.com
338f75a49d
ndb - fix new decimal type mysql vs. ndb
2005-02-16 21:19:42 +01:00
guilhem@mysql.com
0987d81ae6
Merge
2005-02-16 21:03:58 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
e7ebc032cd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.2
2005-02-16 16:54:09 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
25ff6a0938
Merge pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.1
...
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.2
2005-02-16 16:47:29 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
3261bf189a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.1
2005-02-16 16:33:57 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
b119963f13
Merge
2005-02-16 16:29:56 +00:00
pekka@mysql.com
c32fc95769
ndb - temp: comment out decimal tests t/ndb*
2005-02-16 17:10:17 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
aecc58b3d8
Bug#4445
...
Make a more informative platform info for Windows
2005-02-16 16:05:18 +00:00
pem@mysql.com
25a9717a03
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-02-16 16:12:52 +01:00
pem@mysql.comhem.se
de2b28c1ad
Fixed BUG#8540: Local variable overrides an alias.
2005-02-16 16:06:41 +01:00
pekka@mysql.com
51553a5af1
ndb - post-merge fixes
2005-02-16 14:59:17 +01:00
pekka@mysql.com
c177f9fc4a
Merge
2005-02-16 13:14:21 +01:00
pekka@mysql.com
0d03304294
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/pekka/ndb/version/my41-1.2154.30.2
2005-02-16 12:48:38 +01:00
pekka@mysql.com
7c9a155c4a
ndb - fix old decimal type mysql vs ndb
2005-02-16 12:45:59 +01:00
kent@mysql.com
b32f693ee4
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-16 12:10:13 +01:00
dean@mysql.com
e7f410a14a
Merge
2005-02-16 04:04:34 -06:00
msvensson@neptunus.homeip.net
e4ad041abf
Fix ndb_autodiscover
2005-02-16 11:02:48 +01:00
gluh@gluh.mysql.r18.ru
c62da2175f
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-16 13:02:47 +03:00
gluh@gluh.mysql.r18.ru
638dc7d9e9
Fix for bug#7915: crash,JOIN VIEW, subquery, SELECT .. FROM INFORMATION_SCHEMA.COLUMNS
2005-02-16 13:00:03 +03:00
dean@mysql.com
87718094aa
fulltext.test, fulltext.result:
...
Test case for bug#8522, to test for out of bounds memory access in ft_nlq_find_relevance().
2005-02-16 03:13:29 -06:00
guilhem@mysql.com
8e93873d5b
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-16 10:02:54 +01:00
guilhem@mysql.com
bbcc1464d5
rpl_multi_query.test: disable ps-protocol as PS don't support multi-queries
2005-02-16 10:01:05 +01:00
hf@deer.(none)
d75c9dc1d8
Fix for bug #8534 (Compile errors in Precision Math code on Windows)
2005-02-16 11:44:34 +04:00
hf@deer.(none)
48ff0f4c5e
Fix - to not to call val_xxx in Item_func_interval twice
2005-02-16 11:19:47 +04:00
igor@rurik.mysql.com
3100f891d2
Manual merge
2005-02-15 21:03:17 -08:00
igor@rurik.mysql.com
d9f66a261b
Merge rurik.mysql.com:/home/igor/mysql-4.0
...
into rurik.mysql.com:/home/igor/dev/mysql-4.0-0
2005-02-15 18:48:04 -08:00
igor@rurik.mysql.com
d4779d3534
delete.result, delete.test:
...
Added a test case for bug #8392 .
sql_delete.cc:
Fixed bug #8392 .
The bug caused a crash for a delete statement with ORDER BY
that explicitly referred to the modified table.
2005-02-15 18:45:42 -08:00
dean@mysql.com
ace1d892f0
Merge mysql.com:/home/dellis/mysqlab/bk/mysql-4.0
...
into mysql.com:/home/dellis/bkl/bug-4.1
2005-02-15 17:30:40 -06:00
dean@mysql.com
c962d060ac
ft_nlq_search.c:
...
Added bounds check to avoid accessing unallocated FT_DOC array. (BUG #8522 )
2005-02-15 17:27:23 -06:00
joerg@mysql.com
109560c5bf
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2005-02-15 21:03:59 +01:00
dlenev@brandersnatch.localdomain
0a96ef4c90
Temporary disabling part of test which fails in --ps-protocol mode.
2005-02-15 22:17:44 +03:00
dlenev@brandersnatch.localdomain
a3c58bc964
Fixing failing -debug build.
...
Since placement operator delete called only if exception was thrown in
constructor and we don't use exceptions in MySQL, there is no sense to
do anything in String::delete(void *ptr_arg, MEM_ROOT *mem_root).
2005-02-15 22:06:55 +03:00
monty@mysql.com
7bc48798fc
Safety fix
2005-02-15 19:35:28 +02:00
monty@mysql.com
556cf40db1
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-02-15 19:26:30 +02:00
monty@mysql.com
71e4859389
After merge fixes
2005-02-15 19:25:42 +02:00
kent@mysql.com
50fe0ccbea
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-15 16:13:03 +01:00
monty@mysql.com
38d1a42481
Merge with 4.1
2005-02-15 17:12:13 +02:00
monty@mysql.com
410e51c854
Fixed failing test cases 'row.test' when running with --ps-protocol
...
Simple optimzations done while reviewing code
2005-02-15 16:45:00 +02:00