paul@teton.kitebird.com
|
60a3104b03
|
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
|
2004-03-17 08:56:22 -06:00 |
|
ram@gw.mysql.r18.ru
|
757cff9f9b
|
Code cleanup:
- added unsigned_flag= 1; to Item_uint constructors
- removed Item_uint::fix_fields()
- added a comment about fix_fields() call
|
2004-03-17 18:40:04 +04:00 |
|
bell@sanja.is.com.ua
|
8035ce40ec
|
DBUG_ASSERT(fixed == 0) added to fix_fields()
|
2004-03-17 14:26:26 +02:00 |
|
gluh@gluh.mysql.r18.ru
|
9863b6aed9
|
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.clear
|
2004-03-17 16:19:52 +04:00 |
|
gluh@gluh.mysql.r18.ru
|
84e04c74c5
|
Fix for bug#3086: SHOW GRANTS doesn't follow ANSI_QUOTES
|
2004-03-17 16:19:09 +04:00 |
|
ram@gw.mysql.r18.ru
|
16179dbef0
|
Fix for the bug #3155: strange results with index (x, y) ... WHERE x=val_1 AND y>=val_2 ORDER BY pk;
(test case is too big to be included, take a look at the bug database)
|
2004-03-17 15:30:17 +04:00 |
|
hf@deer.(none)
|
5868807b92
|
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.233
|
2004-03-17 14:04:02 +04:00 |
|
guilhem@mysql.com
|
6948c9d9be
|
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
|
2004-03-17 10:35:55 +01:00 |
|
guilhem@mysql.com
|
0f3600d51e
|
Fix for BUG#2922 "Crash (signal11) after "load data from master""
with a testcase.
We needed to init_master_info before we flush_master_info
in LOAD DATA FROM MASTER.
|
2004-03-17 10:35:03 +01:00 |
|
monty@mysql.com
|
f9ad650490
|
merge with 4.0
|
2004-03-17 10:36:12 +02:00 |
|
monty@mysql.com
|
44667503b7
|
After merge fixes
|
2004-03-17 10:30:40 +02:00 |
|
paul@teton.kitebird.com
|
0fb07014bf
|
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
|
2004-03-16 15:32:11 -06:00 |
|
monty@mysql.com
|
350b433569
|
merge with 4.0
|
2004-03-16 22:41:30 +02:00 |
|
bell@sanja.is.com.ua
|
d3f2ad2039
|
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 21:11:59 +02:00 |
|
bell@sanja.is.com.ua
|
da4b43ae17
|
accidentaly removed empty line added
|
2004-03-16 21:09:47 +02:00 |
|
miguel@hegel.local
|
bdd771edc5
|
Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1
into hegel.local:/home/miguel/bk/mysql-4.1
|
2004-03-16 15:55:51 -03:00 |
|
bell@sanja.is.com.ua
|
8a1675c869
|
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 20:55:51 +02:00 |
|
paul@teton.kitebird.com
|
882fad2357
|
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
|
2004-03-16 12:55:49 -06:00 |
|
bell@sanja.is.com.ua
|
293bb8fee7
|
merge
|
2004-03-16 20:23:07 +02:00 |
|
bell@sanja.is.com.ua
|
579a94a328
|
after review & some other fixes
|
2004-03-16 20:19:36 +02:00 |
|
serg@serg.mylan
|
49e9b153ff
|
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
|
2004-03-16 16:35:52 +01:00 |
|
bell@sanja.is.com.ua
|
b8c065c527
|
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-select_list-4.1
|
2004-03-16 17:35:50 +02:00 |
|
serg@serg.mylan
|
7dde35ae19
|
warnings removed
|
2004-03-16 16:35:49 +01:00 |
|
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 |
|