joreland@mysql.com
e86ce67ea5
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-30 07:43:19 +01:00
joreland@mysql.com
474f23a402
ndb - fixed long overdue problems with unique indexes and null values
2004-11-30 07:41:26 +01:00
serg@serg.mylan
cb538e45f5
post-merge fix
2004-11-28 19:48:41 +01:00
serg@serg.mylan
96729c62be
merged
2004-11-28 18:19:01 +01:00
serg@serg.mylan
989721d12f
bad merge fixed
2004-11-28 17:06:40 +01:00
serg@serg.mylan
1a32157950
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-28 16:32:01 +01:00
serg@serg.mylan
7eccc3107f
skip last compress test if we're short of RAM
2004-11-28 16:31:14 +01:00
monty@mysql.com
eb304bd49f
Fixes while reviewing code
...
(Cleanups and better bug fixes)
2004-11-26 02:31:22 +02:00
mats@mysql.com
4ac392fa45
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/bkroot/mysql-4.1
2004-11-25 13:35:53 +01:00
timour@mysql.com
f1e86036ee
Merge mysql.com:/home/timka/mysql/src/4.0-virgin
...
into mysql.com:/home/timka/mysql/src/4.0-master
2004-11-25 13:25:35 +02:00
mats@mysql.com
9ffb3fd39c
Merge
2004-11-25 12:23:41 +01:00
timour@mysql.com
38ab93c6be
Merge for BUG#3759 which was missing from the main tree for some reason.
2004-11-25 11:37:28 +02:00
mats@mysql.com
fe0911e95e
Merge mysql.com:/space/bkroot/mysql-4.0
...
into mysql.com:/space/bk/b6148-mysql-4.0
2004-11-25 09:38:52 +01:00
mats@mysql.com
c06cae0f55
Fix for Bug#6148. Only rewind read position in binary log when the
...
slave SQL thread is started.
2004-11-25 09:26:45 +01:00
serg@serg.mylan
e80bd82e83
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-24 23:47:14 +01:00
serg@serg.mylan
e8203e437a
bug#6784
...
mi_flush_bulk_insert (on dup key error in mi_write)
was mangling info->dupp_key_pos
2004-11-24 23:16:16 +01:00
bar@mysql.com
0f79f61480
Bug#6787 LIKE not working properly with _ and utf8 data
2004-11-24 20:09:54 +04:00
serg@serg.mylan
2ca5a0f2b1
merged
2004-11-22 20:15:48 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
076f27147f
Bug#6252 - Duplicate columns in keys should fail
...
Added check for duplicate column in key
Added tests and fixed tests which exploit bug
2004-11-22 18:07:04 +00:00
serg@serg.mylan
af51d26238
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-11-22 18:47:23 +01:00
serg@serg.mylan
dca2182fdc
ft_boolean_search.c:
...
bug#6705 - (+trunc1* +trunc2*)
fulltext.test, fulltext.result:
bug#6705
2004-11-22 18:37:30 +01:00
serg@serg.mylan
44926664a5
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-22 14:55:20 +01:00
serg@serg.mylan
41c33c29a3
Bug #6748 heap_rfirst() doesn't work (and never did!)
...
range for BETWEEN typo fixed
2004-11-22 14:53:18 +01:00
mskold@mysql.com
31f5d69d3a
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-11-22 13:58:50 +01:00
mskold@mysql.com
6cdf1fc96f
Added NULL value tests for UNIQUE index
2004-11-22 13:58:11 +01:00
dlenev@mysql.com
7897baf7b1
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg6462
2004-11-22 14:21:49 +03:00
dlenev@brandersnatch.localdomain
30f0c495b7
Backport of fix making myisam test results repeatable
2004-11-22 14:17:04 +03:00
mskold@mysql.com
3455e345b2
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-11-22 12:02:32 +01:00
dlenev@mysql.com
64cd633f43
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg6462
2004-11-22 13:06:31 +03:00
dlenev@brandersnatch.localdomain
c37977c87d
Fix for bug #6462 "Same request on same data returns different
...
results." a.k.a. "Proper cleanup of subqueries is missing for SET and DO
statements". (Version #2 with after-review fixes).
To perform proper cleanup for statements that can contain subqueries
but don't have main select we must call free_undelaid_joins().
2004-11-22 13:05:10 +03:00
mskold@mysql.com
f0e95c3704
Added checks for NOT NULL for all fields in UNIQUE INDEX (USING HASH)
2004-11-22 10:35:03 +01:00
bar@mysql.com
e3b94d4ef5
Bug #6737 : REGEXP gives wrong result with case sensitive collation:
...
- A new flag MY_CS_CSSORT was introduced for case sensitivity.
- Item_func_regexp doesn't substiture ICASE not only
for binary collations but for case sensitive collations as well.
2004-11-22 11:58:40 +04:00
konstantin@mysql.com
6337ea8a40
A fix and test case for Bug#6297 "prepared statement, wrong handling
...
of <parameter> IS NULL":
we must not only set Item::null_value in Item_param, but implement
Item_param::is_null() to work well with IS NULL/IS NOT NULL clauses.
2004-11-21 12:04:27 +03:00
dlenev@mysql.com
4e52cc2ded
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg6266
2004-11-19 21:51:37 +03:00
dlenev@mysql.com
aaee135243
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg6439
2004-11-19 21:38:51 +03:00
dlenev@mysql.com
5627dddb93
Manual merge of fix for bug #6439 "from_unixtime() function returns
...
wrong datetime values for too big argument" from 4.0 tree to 4.1 tree.
2004-11-19 19:19:45 +03:00
bar@mysql.com
3b0fd7fe96
func_str.result:
...
This test was moved into func_group.
2004-11-19 19:35:37 +04:00
dlenev@mysql.com
cb7e272e46
Manual merge of fix for bug #6266 "Invalid DATETIME value is not handled
...
properly" with main tree.
2004-11-19 18:35:36 +03:00
bar@mysql.com
770c9be8c2
Bug #6658 MAX(column) returns incorrect coercibility
...
Also, Item_sum_hybrid->charset was removed as redundant,
and switched to use collation.collation instead.
2004-11-19 19:35:36 +04:00
dlenev@mysql.com
40083741ee
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/dlenev/src/mysql-4.0-bg6439
2004-11-19 17:54:14 +03:00
bar@mysql.com
6de458c232
Reuse ctype_common.inc instead of retyping
...
the same queries.
2004-11-19 14:33:55 +04:00
bar@mysql.com
f9d1a5a1c6
Incorrect response with partial utf8 index
2004-11-19 14:25:25 +04:00
tomas@poseidon.ndb.mysql.com
287fe9e313
ndb_grant.result, ndb_grant.test:
...
new file
2004-11-19 09:17:36 +00:00
mskold@mysql.com
7bbee8c95d
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-11-18 15:55:18 +01:00
bar@mysql.com
fe3b359b74
Check that the third UNION part with COLLATE
...
clause resolves collation conflict for the
first and the second parts pair.
2004-11-18 16:15:48 +04:00
mskold@mysql.com
a4d061a5d9
Fix for bug#4312 ndb table, wrong behaviour on insert .. on duplicate key ..
2004-11-18 12:11:56 +01:00
serg@serg.mylan
19067008b8
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-17 17:54:15 +01:00
guilhem@mysql.com
f04832b52d
time independent test
2004-11-17 17:06:24 +01:00
guilhem@mysql.com
d34421c127
Fixes for compilation errors in Windows (casts from uint32* to uint*) in repl and charset code.
...
Moving the part of user_var.test using UCS2 to ctype_ucs.test
2004-11-17 16:41:30 +01:00
serg@serg.mylan
37e872de8c
merged
2004-11-17 15:28:37 +01:00