petr@mysql.com
14346aa9a4
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/cps/mysql/devel/5.1-repair-csv
2006-03-29 06:34:12 +04:00
petr@mysql.com
39a251f35b
Post-review fixes for WL#3154 "Enable REPAIR for CSV tables"
2006-03-29 06:28:57 +04:00
bar@mysql.com
b56bc04c7d
Merge mysql.com:/usr/home/bar/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-28 18:24:04 +05:00
bar@mysql.com
fc86e304cc
cast.result:
...
After merge fix.
2006-03-28 18:21:19 +05:00
gluh@mysql.com
15ecaa1866
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-03-28 17:26:45 +05:00
gluh@eagle.intranet.mysql.r18.ru
9c82b6746a
Bug#18053 Partitions: crash if null
...
Bug#18070 Partitions: wrong result on WHERE ... IS NULL
removed unnecessary code
added handling of NULL values
2006-03-28 17:25:19 +05:00
bar@mysql.com
29b8e09732
Merge mysql.com:/usr/home/bar/mysql-4.1.b15098
...
into mysql.com:/usr/home/bar/mysql-5.0
Bug#15098
2006-03-28 17:07:26 +05:00
mskold@mysql.com
c85cc93f48
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-28 13:28:36 +02:00
andrey@lmy004.
ebff866137
update result
2006-03-28 13:28:35 +02:00
mskold@mysql.com
cd557bf495
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-28 13:28:34 +02:00
andrey@lmy004.
e2a9045a87
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug14356
2006-03-28 13:28:34 +02:00
tomas@poseidon.ndb.mysql.com
b25045beb4
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-28 11:47:49 +02:00
andrey@lmy004.
fe2e9a903f
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug14356
2006-03-28 10:42:46 +02:00
mskold@mysql.com
6e0d4d2d45
Added tests with IGNORE and NULL values
2006-03-28 10:01:23 +02:00
mskold@mysql.com
c76ab0a4f6
Fix for Bug #15722 Engine_condition_pushdown fails when using blobs(text)
2006-03-28 09:59:20 +02:00
igor@rurik.mysql.com
22d66dccd6
Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-03-27 18:30:40 -08:00
igor@rurik.mysql.com
f57e0b3db7
Fixed bug #18386 .
...
An invalid assertion in Item_direct_view_ref::eq caused
an assertion abort in the debug version.
2006-03-27 18:28:55 -08:00
tomas@poseidon.ndb.mysql.com
3fbcdb5dcc
removed rpl_ndb_sp007 test as it uses savepoints which is only supported by innodb
...
compile error fixes
2006-03-27 19:41:37 +02:00
gkodinov@mysql.com
ddcfa13d27
Merge mysql.com:/home/kgeorge/mysql/5.0/B15102
...
into mysql.com:/home/kgeorge/mysql/5.1/B15102
2006-03-27 12:35:16 +03:00
gkodinov@mysql.com
b35d97d02a
Test case for BUG#15102 : select distinct returns empty result, select count distinct > 0 (correct)
...
Reproduced in 5.0.16-nt. Tested to work in 5.0.20
2006-03-27 12:20:25 +03:00
dlenev@mysql.com
e7d2b09e14
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/dlenev/mysql-5.1-merges
2006-03-25 19:03:09 +03:00
andrey@lmy004.
d770c77504
update
2006-03-25 13:14:52 +01:00
andrey@lmy004.
fd35e81b75
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16415
2006-03-25 13:05:34 +01:00
dlenev@mysql.com
85c1e4d25f
Updated test case. SHOW CREATE TABLE uses uppercase DEFAULT clause in 5.1.
2006-03-25 12:07:45 +03:00
igor@rurik.mysql.com
ec4910c413
Merge rurik.mysql.com:/home/igor/mysql-5.1
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-03-24 15:24:06 -08:00
andrey@lmy004.
75cba7b5cc
manual merge
2006-03-25 00:24:04 +01:00
dlenev@mysql.com
8643070cda
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/dlenev/mysql-5.1-merges
2006-03-25 02:24:04 +03:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
4362a7a1b6
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
2006-03-24 17:34:12 -05:00
igor@rurik.mysql.com
1fd7f10952
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-03-24 12:56:31 -08:00
igor@rurik.mysql.com
69eb4e6932
Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-03-24 12:46:33 -08:00
igor@rurik.mysql.com
e99247775a
Fixed bug #17164 .
...
If the WHERE condition of a query contained an ORed FALSE term
then the set of tables whose rows cannot serve for null complements
in outer joins was determined incorrectly. It resulted in blocking
possible conversions of outer joins into joins for such queries.
2006-03-24 12:44:54 -08:00
dlenev@mysql.com
3205f00449
Merge mysql.com:/home/dlenev/mysql-5.0-bg18153
...
into mysql.com:/home/dlenev/mysql-5.1-merges
2006-03-24 19:46:01 +03:00
andrey@lmy004.
531ad766ed
fix for bug#16415 Events names are case sensitive
2006-03-24 17:45:52 +01:00
msvensson@neptunus.(none)
3dd641bd5c
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-24 13:50:41 +01:00
dlenev@mysql.com
ec96a87912
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/mysql-5.0-bg18153
2006-03-24 15:28:08 +03:00
mskold@mysql.com
aa465e5b14
Enabled test rpl_ndb_insert_ignore
2006-03-24 13:26:35 +01:00
dlenev@mysql.com
891e9424f2
Fix for bug #18153 "ALTER/OPTIMIZE/REPAIR on transactional tables corrupt
...
triggers".
Applying ALTER/OPTIMIZE/REPAIR TABLE statements to transactional table or to
table of any type on Windows caused disappearance of its triggers.
Bug was introduced in 5.0.19 by my fix for bug #13525 "Rename table does not
keep info of triggers" (see comment for sql_table.cc for more info).
.
2006-03-24 14:58:18 +03:00
msvensson@neptunus.(none)
ab1f95df3e
Merge 192.168.0.100:mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-24 12:33:11 +01:00
mskold@mysql.com
6272ddc173
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2006-03-24 10:52:44 +01:00
mskold@mysql.com
a945c58ffe
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-23 22:39:30 +01:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
1608452dbd
Added new test cases for the bug #16806
2006-03-23 16:14:47 -05:00
ramil@mysql.com
d84e9df761
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2006-03-23 18:11:40 +04:00
ramil@mysql.com
2a6217a9b1
Fix for bug #18306 : MySQL crashes and restarts using subquery
2006-03-23 18:09:35 +04:00
bar@mysql.com
b2b020b318
Merge mysql.com:/usr/home/bar/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-23 14:14:32 +04:00
bar@mysql.com
296d4b2f2c
Bug#15376: Unassigned multibyte codes are converted to U+0000
...
Mergeing changes into 5.0
2006-03-23 14:03:39 +04:00
mskold@mysql.com
25c149da04
Fix for Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transaction already aborted'
2006-03-23 09:48:46 +01:00
bar@mysql.com
1008146d86
Merge mysql.com:/usr/home/bar/mysql-4.1.b15376
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-03-23 12:41:28 +04:00
bar@mysql.com
b372b28e1f
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-23 10:25:04 +04:00
bar@mysql.com
ddc37c547f
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-03-23 10:20:40 +04:00
bar@mysql.com
6ab496ac06
Merge mysql.com:/usr/home/bar/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-23 10:19:55 +04:00