cmiller@zippy.(none)
de5eea6d2e
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug11151
2006-03-28 17:38:28 -05:00
cmiller@zippy.(none)
d51158fd1d
Bug#11151: LOAD DATA INFILE commits transaction in 5.0
...
No longer create or commit transactions within the loading of files.
2006-03-28 17:15:45 -05:00
bar@mysql.com
a586f5a18b
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-03-28 20:04:50 +05:00
pem@mysql.com
6be4db9a6d
Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
...
into mysql.com:/extern/mysql/5.0/bug17015/mysql-5.0-runtime
2006-03-28 17:03:14 +02:00
jonas@perch.ndb.mysql.com
48fa5cb63c
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-03-28 15:40:08 +02:00
bar@mysql.com
4886c53fbb
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15098
2006-03-28 18:32:58 +05:00
jonas@perch.ndb.mysql.com
0a9db2a056
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-03-28 15:31:26 +02:00
bar@mysql.com
fc86e304cc
cast.result:
...
After merge fix.
2006-03-28 18:21:19 +05:00
pem@mysql.com
e0a2455f19
Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
...
into mysql.com:/extern/mysql/5.0/bug17015/mysql-5.0-runtime
2006-03-28 15:08:17 +02:00
jonas@perch.ndb.mysql.com
4e819b7377
ndb - bug#17729 bug#18406
...
Ndbapi can reorder recattr when doing sorted scan (for faster comparision)
make sure handler maps correct recattr to correct mysql column
2006-03-28 14:38:16 +02:00
pem@mysql.com
1a1da0e3ef
Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
...
into mysql.com:/extern/mysql/5.0/bug16474/mysql-5.0-runtime
2006-03-28 14:18:47 +02:00
pem@mysql.com
b310d4fb4d
Post review fixes for BUG#16474: SP crashed MySQL.
2006-03-28 14:16:21 +02: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
konstantin@mysql.com
71defb7a80
A fix and a test case for Bug#15683 "crash, Function on nested
...
VIEWs, Prepared statement": we didn't mark the nested views
as 'prelockng placeholders' when building the prelocking list.
This resulted in these views being processed (merged, materialized)
before they are actually used.
2006-03-28 15:06:29 +04: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
df80048d5f
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2006-03-27 20:16:52 -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
ian@zim.(none)
8607f1df65
Disable udf test
2006-03-27 18:25:35 -08: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
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
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
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
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
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
msvensson@shellback.(none)
7162b65c24
Only run in libtool if running in valgrind.
...
Apparently libtool isn't properly setup on all our build hosts.
2006-03-23 22:29:53 +01:00
msvensson@shellback.(none)
8f1ed3c463
Dump result to .log file at test failure
2006-03-23 21:48:31 +01:00
msvensson@shellback.(none)
948cecf477
Delete gdbinit file before writing to it
...
Concat type+idx to get a unique gdbinit filename
2006-03-23 20:05:09 +01:00
msvensson@shellback.(none)
4602e426dc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-03-23 18:58:53 +01:00
msvensson@shellback.(none)
f4426c0d3d
Remove unused option "verbose"
2006-03-23 16:41:29 +01:00
msvensson@shellback.(none)
8091b7b5f1
Moved "tmpdir" and 2vardor" to the documented flags and add some documentation
2006-03-23 16:39:51 +01:00
msvensson@shellback.(none)
6a65f08c26
Add support fo --manual-debug, --manual-gdb and -manual-ddd
...
Touchups
2006-03-23 16:22:56 +01:00
msvensson@shellback.(none)
e6bf664c62
Merge shellback.(none):/home/msvensson/mysql/mysqltestrun_pl/my50-mysqltestrun_pl
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-03-23 15:30:21 +01: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
msvensson@shellback.(none)
2b38c41bda
mysql-test-run.pl
...
Add support for debuggers and impove support for valgrind
2006-03-23 15:07:39 +01:00
bar@mysql.com
517f66b47c
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-03-23 17:30:03 +04:00
bar@mysql.com
8620ac4d64
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15376
2006-03-23 14:29:43 +04:00
lars@mysql.com
12dadb0073
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0
2006-03-23 11:23:05 +01: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
a4d4ed9ec8
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-03-23 12:27:10 +04:00
lars@mysql.com
a35a81c7e5
New file to remove sleeps in mysql-test-run (backported from 5.1)
2006-03-23 09:19:01 +01:00
bar@mysql.com
d97d48cb26
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b17374
2006-03-23 11:51:46 +04:00
msvensson@neptunus.(none)
c6e6c0d649
Move the replcae result to before the correct select
2006-03-23 08:21:16 +01: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
82de23010b
Merge mysql.com:/usr/home/bar/mysql-4.1.b17374
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-03-23 10:17:31 +04:00
msvensson@neptunus.(none)
02b59fd317
Save core files before removing the data_dir
2006-03-22 22:34:48 +01:00
msvensson@neptunus.(none)
7d3a809695
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-22 16:52:31 +01:00