hf@deer.(none)
44e34ad816
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.3264
2004-03-25 11:36:52 +04:00
paul@ice.snake.net
44fe065a39
I didn't get a couple of system variables alphabetized correctly.
2004-03-24 20:30:49 -06:00
paul@ice.snake.net
f47e32473b
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-03-24 15:28:14 -06:00
serg@serg.mylan
5de17ec592
protection against "ln -s /etc/passwd /tmp/failed-mysql-bugreport"
2004-03-24 20:27:07 +01:00
serg@serg.mylan
b84a9dcf86
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-24 17:24:08 +01:00
serg@serg.mylan
07c19b44ef
accorting to the manual, when neither GLOBAL or SESSION in SET
...
is specified, the default is SESSION.
2004-03-24 16:33:47 +01:00
Sinisa@sinisa.nasamreza.org
2d970b2ea4
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-03-24 17:04:58 +02:00
hf@deer.(none)
1eccd27d83
Fix for #3067
...
Shouldn't be moved to 4.1
2004-03-24 19:04:57 +04:00
serg@serg.mylan
34c28c6bd9
SHOW PRIVILEGES updated (Bug#3227)
2004-03-24 14:44:31 +01:00
bar@bar.intranet.mysql.r18.ru
aa4cd447d2
ctype-uca.c:
...
Conditional compilation
2004-03-24 16:18:56 +04:00
bar@bar.intranet.mysql.r18.ru
3827fa5589
Unicode Collation Algorithm subset implementation
2004-03-24 16:16:08 +04:00
bell@sanja.is.com.ua
aa3f28722c
fixed function name in a comment
2004-03-24 11:54:58 +02:00
paul@ice.snake.net
b8674a464e
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-03-23 22:48:30 -06:00
bell@sanja.is.com.ua
23a74015f1
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-conf-4.0
2004-03-23 22:11:50 +02:00
serg@serg.mylan
97091f38fe
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-03-23 19:26:03 +01:00
serg@serg.mylan
4f4668ef20
comment
2004-03-23 19:25:30 +01:00
bell@sanja.is.com.ua
f90e7c24e8
fixed debug information
2004-03-23 19:28:18 +02:00
bell@sanja.is.com.ua
e5b2e9b132
removed unneeded bzero
2004-03-23 19:24:35 +02:00
hf@deer.(none)
386feb494b
Fix for #3264 (FROM_DAYS doesn't work properly in range comparison)
...
Item_func_from_days::get_date didn't change 'hr', 'min' and some
other fields of incoming ltime, so they got random values.
bzeroing of the ltime added
2004-03-23 21:10:23 +04:00
bell@sanja.is.com.ua
19ffa1cd53
used right table for grants check (BUG#3270)
2004-03-23 17:15:20 +02:00
bar@bar.intranet.mysql.r18.ru
403001ff1c
uca-dump.c:
...
Don't dump default implicit weights
2004-03-23 18:29:07 +04:00
serg@serg.mylan
0d0910381a
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-23 15:25:45 +01:00
hf@deer.(none)
023b86b984
small addition to the fix for #3188
...
dropping of tables added to the testcase
2004-03-23 18:25:44 +04:00
hf@deer.(none)
87612b5294
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.3266
2004-03-23 17:58:55 +04:00
hf@deer.(none)
7ab1c2106d
Fix for #3266 (garbled TEXT fields as a result of CREATE TABLE SELECT)
...
Problem is that Item::save_in_field modifies str_value member
before it calls val_str but Item_copy_string::val_str just returns
this str_value as the result.
I added local String variable to the Item::save_in_field
2004-03-23 17:57:14 +04:00
serg@serg.mylan
99886df867
correct support for a mix of UNION/UNION ALL in the same query.
...
Bug#1428
2004-03-23 14:43:24 +01:00
bell@sanja.is.com.ua
ce7798c45e
fixed union with prepared statement bug found by Konstantin
2004-03-23 14:26:54 +02:00
Sinisa@sinisa.nasamreza.org
cef627cece
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-03-23 14:04:32 +02:00
hf@deer.(none)
ea2c160919
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.3188
2004-03-23 13:09:50 +04:00
hf@deer.(none)
a90f34ab6b
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.3067
2004-03-23 11:58:04 +04:00
jcole@mugatu.jcole.us
15cc92cacb
Added LOCAL INFILE callback function support.
2004-03-22 19:58:49 -05:00
Greg@greg-laptop.
663b3ffea8
Changes to project files precipitated from 4.1 test builds.
2004-03-22 14:30:30 -07:00
Greg@greg-laptop.
de09e55b8b
Merge gweir@build.mysql.com:/home/bk/mysql-4.1
...
into greg-laptop.:C:/cygwin/bk/mysql-4.1
2004-03-22 13:42:22 -07:00
paul@ice.snake.net
d30313666a
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-03-22 14:39:09 -06:00
hf@deer.(none)
1f709b1985
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.3067
2004-03-22 21:38:32 +04:00
hf@deer.(none)
1b78e7dd41
Fix for #3067 (REPAIR TABLE reenables disabled keys)
2004-03-22 21:34:36 +04:00
bell@sanja.is.com.ua
6158c94b32
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-alias-4.1
2004-03-22 18:19:02 +02:00
heikki@hundin.mysql.fi
035778d631
sync0sync.c:
...
Actually, assembler is used onnly on 32-bit x86 Win, and no need to exclude Netware specifically
2004-03-22 18:11:13 +02:00
heikki@hundin.mysql.fi
d25727c81a
Merge heikki@build.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/heikki/mysql-4.0
2004-03-22 18:07:49 +02:00
heikki@hundin.mysql.fi
d22f36cdfd
sync0sync.c:
...
Fix typo __NETWARE --> __NETWARE__ in mutex creation
2004-03-22 18:06:26 +02:00
paul@teton.kitebird.com
389ab9fc5d
"automagically" is not a word.
2004-03-22 09:38:57 -06:00
Sinisa@sinisa.nasamreza.org
6c389aff75
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-03-22 16:36:27 +02:00
Sinisa@sinisa.nasamreza.org
2eaa07f199
union.result:
...
A test case for the bug that allowed table names to be used in ORDER BY columns (But #3064 )
union.test:
A test case for the bug that allowed table names to be used in ORDER BY columns (But #3064 )
sql_union.cc:
A fix for a bug that allowed table names to be used in ORDER BY columns (But #3064 )
2004-03-22 16:35:15 +02:00
hf@deer.(none)
182aa5bec9
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-03-22 17:48:29 +04:00
bell@sanja.is.com.ua
bbb6642a66
aliases should be compared with my_strcasecmp (BUG#3251)
...
some db comparison code cleupup
removed compiler warnings
2004-03-22 15:43:13 +02:00
bar@bar.intranet.mysql.r18.ru
5c4b54f495
uca-dump.c:
...
new file
2004-03-22 15:14:12 +04:00
bar@bar.intranet.mysql.r18.ru
d82d09b699
.del-uca-dump.c~da786d5a909db27a:
...
Delete: mysys/uca-dump.c
2004-03-22 15:13:47 +04:00
monty@mysql.com
8c4ade710b
Fixed wrong 'mysql.func' definition
2004-03-22 11:18:29 +02:00
Greg@greg-laptop.
7ec29e9fcb
Changes in Windows project files instituted after latest 4.1 test build.
2004-03-21 18:03:34 -07:00
paul@ice.snake.net
7b45773fa6
Some SHOW STATUS lines were in non-alphabetic order.
2004-03-21 15:58:08 -06:00