Commit graph

11941 commits

Author SHA1 Message Date
monty@mysql.com
baa45774d6 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-03-26 14:45:13 +02:00
monty@mysql.com
48680ee3a0 Allow keys with 0 segements in MyISAM
This fixed a bug in SELECT DISTINCT when all selected parts where constants. (Bug #3203)
2004-03-26 14:44:52 +02:00
bar@bar.intranet.mysql.r18.ru
b11ee0d8bb Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
2004-03-26 16:21:49 +04:00
serg@serg.mylan
072ddb0194 bad merge (?) fixed 2004-03-26 13:21:48 +01:00
bar@bar.intranet.mysql.r18.ru
3aea3e92ce 1. New data types, from the user point of view:
BINARY(N) and VARBIBARY(N)
2. More 4.0 compatibility and more BINARY keyword consistency:
2a. CREATE TABLE a (a CHAR(N) BINARY) 
    is now synonym for
    CREATE TABLE a (a CHAR(N) COLLATE xxxx_bin)
2b. SELECT BINARY x
    is still synonin for
    SELECT x COLLATE xxxxx_bin.
2004-03-26 16:11:46 +04:00
serg@serg.mylan
9bf7e07b75 version updated after merge :) 2004-03-26 12:36:57 +01:00
bar@bar.intranet.mysql.r18.ru
745e130ae9 charset2html.c:
Don't print control characters
2004-03-26 14:46:42 +04:00
monty@mysql.com
447baa9011 After merge fixes + simple optimizations 2004-03-26 11:06:53 +02:00
bell@sanja.is.com.ua
9ed179ee8e Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.0
2004-03-26 10:53:13 +02:00
monty@mysql.com
e0e0314d60 Merge with 4.0 2004-03-25 23:29:45 +02:00
monty@mysql.com
488fe61074 Updated tests after merge 2004-03-25 23:08:42 +02:00
monty@mysql.com
3b34a6a2dd Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-03-25 22:18:31 +02:00
monty@mysql.com
1448199bd7 Cleanups & safety fixes 2004-03-25 22:11:22 +02:00
monty@mysql.com
ce79eb9ca7 merge with 3.23 2004-03-25 22:05:09 +02:00
monty@mysql.com
d6f9fa0376 Improved test case
service backport from 4.0
2004-03-25 21:52:25 +02:00
pem@mysql.com
e5f9e18d2f Merge fix. 2004-03-25 17:48:00 +01:00
pem@mysql.comhem.se
6395822932 Fixed BUG#3117: LAST_INSERT_ID() works incorrectly inside stored procedure.
This turned out to be a problem for prepared statements as well; the id was
evaluated once, at parse time.
2004-03-25 17:42:13 +01:00
monty@mysql.com
eb91f7b478 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-03-25 15:05:42 +02:00
monty@mysql.com
ebc3b3afac BTREE-indexes in HEAP tables can now be used to optimize ORDER BY
Don't read character set files if we are using only the default charset. In most cases the user will not anymore get a warning about missing character set files
Compare strings with space extend instead of space strip. Now the following comparisons holds:  "a" == "a " and "a\t" < "a". (Bug #3152).
Note: Because of the above fix, one has to do a REPAIR on any table that has an ascii character < 32 last in a CHAR/VARCHAR/TEXT columns.
2004-03-25 15:05:01 +02:00
bell@sanja.is.com.ua
eea205096b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-3.23
into sanja.is.com.ua:/home/bell/mysql/bk/work-alter-3.23
2004-03-25 15:00:41 +02:00
bell@sanja.is.com.ua
3bf55c9a3d 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-25 14:40:36 +02:00
serg@serg.mylan
755c068ff9 bugs-aware post-commit trigger
cleanup (VERSION variable)
2004-03-25 13:29:12 +01:00
bar@bar.intranet.mysql.r18.ru
ed33257c6e Bug #3290 [Ver]: Can't convert sjis&ujis half-width katakana correctly
UJIS part fix
2004-03-25 16:15:52 +04:00
serg@serg.mylan
01cabfe58c Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-03-25 11:33:41 +01:00
bar@bar.intranet.mysql.r18.ru
1741cb88c0 #3290: Can't convert sjis&ujis half-width katakana correctly 2004-03-25 14:29:56 +04:00
serg@serg.mylan
d8a9a8267b shared IO_CACHE: protection against remove_io_share in a wrong time
bug#3134
2004-03-25 11:22:01 +01:00
hf@deer.(none)
1d5c7c2f9b Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.3266
2004-03-25 12:50:23 +04:00
hf@deer.(none)
7e5a6efcf1 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.3266
2004-03-25 11:38:53 +04:00
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