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
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
hf@deer.(none)
91d5e55a90
Fix for #233
...
test for IGNORE added
2004-03-17 14:03:26 +04: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
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
eb6f68ec9a
uuid() tests
2004-03-16 16:35:53 +01: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
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
28b8501326
after merge fix
2004-03-16 16:30:10 +02: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
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
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
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
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
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
bell@sanja.is.com.ua
c5d4801678
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 17:41:03 +02:00
gluh@gluh.mysql.r18.ru
9f22beb242
Fix for bug#2972 Problem the the CONV() function
2004-03-15 19:18:30 +04: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
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
serg@serg.mylan
ded8fa56eb
my_strtod fixes:
...
sigsegv protection (exp overflow)
don't return inf!
use errno=EOVERFLOW to signal an overflow (as my_strntod uses errno anyway)
if errno will be too slow, my_strtod can be changed to return overflow status in a parameter (like my_strntod does)
2004-03-14 17:25:20 +01:00
vva@eagle.mysql.r18.ru
283d455711
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_856/mysql-4.1
2004-03-14 01:33:16 +04:00
vva@eagle.mysql.r18.ru
b3cb4dace5
fixed bug #856 'Naming a key "Primary" causes trouble'
2004-03-14 01:31:30 +04:00
vva@eagle.mysql.r18.ru
5bada5ee99
fixed bug #1427 "enum allows duplicate values in the list"
2004-03-13 23:13:31 +04:00
vva@eagle.mysql.r18.ru
0be2ef688c
merge correcttion in mysql-test/r/mysqldump.result
2004-03-11 22:43:10 +04:00
vva@eagle.mysql.r18.ru
bb6aee84ef
Merge
2004-03-11 22:01:25 +04:00
vva@eagle.mysql.r18.ru
3c1ba83296
fixed bug #2591 "mysqldump quotas names inconsistently"
2004-03-11 18:46:27 +04:00
ram@gw.mysql.r18.ru
0aab3a9eba
a fix (bug #2885 : like datetime)
2004-03-11 18:21:57 +04:00
ram@gw.mysql.r18.ru
cd7ec53dad
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b3036
2004-03-10 13:36:20 +04:00
jani@ua72d24.elisa.omakaista.fi
8dcb41d8d9
Fixed Bug#3115. CAST AS DATE with malformed string returns NULL but IS NULL
...
is false.
2004-03-09 22:03:01 +02:00
ram@gw.mysql.r18.ru
8ffd9a9190
Fix for the bug #3089 : SUBSTRING bug when mixed with CONCAT and ORDER BY
2004-03-09 16:52:37 +04:00
bell@sanja.is.com.ua
7e48a0f610
merge
2004-03-09 12:52:25 +02:00
paul@ice.snake.net
ea28e842cd
Make SHOW VARIABLES output really alphabetic.
...
Note: the patch removes an extra declaration of
the read_only variable. It also assumes that '_'
sorts before [a-z].
2004-03-07 20:19:37 -06:00