bell@sanja.is.com.ua
c9938b9dff
merge
2004-03-16 17:35:49 +02:00
serg@serg.mylan
ceec63f18a
EOVERFLOW moved to my_base.h - it is used not only in strtod.c
...
error message corrected
2004-03-16 16:35:47 +01:00
bell@sanja.is.com.ua
cd5c30c5dc
fix test during merge
2004-03-16 16:30:09 +02:00
bell@sanja.is.com.ua
96a9d0da52
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-rand-4.1
2004-03-16 16:30:08 +02:00
bell@sanja.is.com.ua
b206f29e6c
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2004-03-16 15:14:12 +02:00
gluh@gluh.mysql.r18.ru
df842c2fc3
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.clear
2004-03-16 17:14:11 +04:00
bell@sanja.is.com.ua
7106dcfd06
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-lower_case-4.1
2004-03-16 15:14:11 +02:00
ram@gw.mysql.r18.ru
bfc1e46c10
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2885
2004-03-16 17:14:10 +04:00
bell@sanja.is.com.ua
73e5e0672c
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-lower_case-4.1
2004-03-16 15:14:10 +02:00
vva@eagle.mysql.r18.ru
8d5430ef73
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_2709/mysql-4.1
2004-03-16 17:14:09 +04:00
ram@gw.mysql.r18.ru
f54827e5d0
Fix for the bug #3118 : Subquery and order by
2004-03-16 16:28:50 +04:00
hf@deer.(none)
cdc27d597e
Fix for #233 (final part)
2004-03-16 14:59:22 +04:00
gluh@gluh.mysql.r18.ru
8ba33d7dd3
Fix for bug#2586 Disallow global/session/local as structured var. instance names
2004-03-16 14:01:05 +04:00
hf@deer.(none)
2011d717cb
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.233
2004-03-16 13:27:25 +04:00
hf@deer.(none)
ceaac59c42
Fix for #233 (the second one)
2004-03-16 13:26:37 +04:00
ram@gw.mysql.r18.ru
75ced0832e
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2885
2004-03-16 12:59:06 +04:00
gluh@gluh.mysql.r18.ru
f6816f32bd
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gluh.mysql.r18.ru:/home/gluh/Bugs/mysql-4.0.3067
2004-03-16 11:33:36 +04:00
gluh@gluh.mysql.r18.ru
86211a1b44
Fix for bug #2629 NULLIF() doesn't behave as described in manual
2004-03-16 11:33:03 +04:00
bell@sanja.is.com.ua
e8a9242893
merge
2004-03-16 08:32:21 +02:00
bell@sanja.is.com.ua
7ff1a94358
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-lower_case-4.1
2004-03-16 08:18:36 +02:00
bell@sanja.is.com.ua
ac8c1cc4be
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-fix_fields-4.1
2004-03-16 07:40:11 +02:00
monty@mysql.com
861bf3c8c0
Portability fix
2004-03-16 02:41:36 +02:00
monty@mysql.com
a6ba9f3cbc
Fixed memory overrun in spatial init code
2004-03-16 00:42:10 +02:00
monty@mysql.com
56af3931e0
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-03-16 00:04:07 +02:00
serg@serg.mylan
166c068971
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-15 23:04:05 +01:00
monty@mysql.com
37390968e7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-03-16 00:04:05 +02:00
hf@deer.(none)
e90c78ceb5
Small fix
2004-03-16 02:04:03 +04:00
bell@sanja.is.com.ua
8187b23043
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-rand-4.1
2004-03-15 23:53:28 +02:00
hf@deer.(none)
ac9de85b0f
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-03-16 01:53:27 +04:00
hf@deer.(none)
f2ef7e1a32
Yet another fix for spatial parts
2004-03-16 01:50:35 +04:00
serg@serg.mylan
3351b01d83
cleanup
2004-03-15 22:02:47 +01:00
bell@sanja.is.com.ua
6eb403cfdc
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-rand-4.1
2004-03-15 22:17:31 +02:00
bell@sanja.is.com.ua
b4bb6b7f77
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-rand-4.1
2004-03-15 21:53:25 +02:00
konstantin@mysql.com
36120d420a
Fix of compilation failure of latest 4.1 tree: new constants in mysqld.cc
...
exceed unsigned long limit.
2004-03-15 22:39:36 +03:00
vva@eagle.mysql.r18.ru
189761bcd3
actions for bug
...
#2709 Affected Rows for ON DUPL. KEY undocumented, perheps illogical
1. added COPY_INFO::updated to work with it in
'insert .. on duplicate' instead of COPY_INFO::deleted
2. added affected rows to output of "info:" in mysqltest.c
2004-03-15 21:36:16 +04:00
konstantin@mysql.com
e43ac76094
Fixes for bugs #2274 "mysqld gets SIGSEGV during processing of malformed
...
COM_EXECUTE packet" and #2795 "prepare + execute without bind_param crashes
server" and #2473 "seg fault running tests/client_test.c":
- length checking added to packet parser
- default impelemntation of Item_param::set_param_func will work in
case of malformed packet.
No test cases are possible in our test suite, as there are no tests
operating on protocol layer.
2004-03-15 20:20:47 +03:00
bell@sanja.is.com.ua
6fc3d9ba81
merge
2004-03-15 17:01:30 +02:00
bell@sanja.is.com.ua
3e1c841ced
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-fix_fields-4.1
2004-03-15 16:31:41 +02:00
gluh@gluh.mysql.r18.ru
df0ede69fc
Task #835 : additional changes fot str_to_date
2004-03-15 18:28:21 +04:00
bell@sanja.is.com.ua
56a9b11872
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
2004-03-15 15:39:28 +02:00
bell@sanja.is.com.ua
bffd015308
after review fixes
2004-03-15 15:38:53 +02:00
hf@deer.(none)
54167da4b0
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.valg
2004-03-15 16:57:56 +04:00
hf@deer.(none)
317e89bc49
Fix for valgrind's warning
2004-03-15 16:32:53 +04:00
monty@mysql.com
9e8938cbae
merge & simple cleanup
2004-03-15 13:21:14 +02:00
bell@sanja.is.com.ua
d2265b6345
merge
2004-03-15 13:16:40 +02:00
monty@mysql.com
cf66e187e2
Optimizations
2004-03-15 12:53:27 +02:00
bell@sanja.is.com.ua
443870e95e
fixed comments
2004-03-15 11:02:54 +02:00
miguel@hegel.local
a81d480d78
Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hegel.local:/home/miguel/bk/mysql-4.1
2004-03-14 16:44:23 -03:00
serg@serg.mylan
42c19ada56
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-14 11:51:09 +01:00
serg@serg.mylan
ae279eae3b
UUID() bug that manifests itself on low-res (<1 us) timers only
...
(and not critical at all as it does not result in repeated values)
2004-03-14 11:50:15 +01:00