pem@mysql.com
cc17bb3404
Removed forgotten comment line in sql_select.cc.
2006-03-28 16:05:06 +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
pem@mysql.com
e51adff01c
Review fix for BUG#17015: Routine name truncation not an error
2006-03-28 15:06:06 +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
37a6167d6d
Post review fix for Bug #15722 Engine_condition_pushdown fails when using blobs(text)
2006-03-28 11:46:35 +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
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)
34b54fa83c
Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/ian/workspace/mysql-5.0
2006-03-27 18:27:57 -08:00
ian@zim.(none)
8607f1df65
Disable udf test
2006-03-27 18:25:35 -08:00
ian@zim.(none)
a66aace3e9
Fix for bug #16855
2006-03-27 17:45:06 -08:00
kent@mysql.com
1da875b233
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-03-28 01:56:24 +02:00
kent@mysql.com
6b51a2c69f
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-03-27 23:08:25 +02:00
kent@mysql.com
04f059c5bf
mysql_config.sh:
...
Remove Solaris -xc99=none C option as C++ compiler can't handle it
2006-03-27 23:04:44 +02:00
anozdrin@mysql.com
cc1ee7e48b
Fix for BUG#15921: DROP TRIGGER - can't be drop trigger created
...
in older version.
The problem is that TRN-files created in "old" versions contain
junk in trigger_table field, which is not acceptable in "new" versions.
2006-03-28 01:01:51 +04:00
kent@mysql.com
898db8b053
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-03-27 19:37:29 +02:00
kent@mysql.com
35ae639477
mysql_config.sh:
...
We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322
2006-03-27 19:25:25 +02:00
monty@mysql.com
25adcb6500
Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-03-27 15:23:16 +03:00
pekka@mysql.com
5903a839c9
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/pekka/ndb/version/my50
2006-03-27 13:31:33 +02:00
pekka@mysql.com
825f97c7b5
ndb - bug#17380: Missing charset causes NDB Client to crash
2006-03-27 13:16:53 +02:00
monty@mysql.com
aecd1502b1
Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-03-27 13:47:13 +03:00
jonas@perch.ndb.mysql.com
72aaf98396
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-03-27 11:52:54 +02: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
monty@mysql.com
4ab6bc4b43
Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-03-27 12:07:59 +03:00
monty@mysql.com
3dcbbb7c4d
Safer fix for Bug #18435 "5.0.19 libmysqlclient not ABI-compatible with 5.0.18"
...
This fixes the problem if someone is using struct MYSQL as part of another structure together with a shared
library
2006-03-27 12:02:23 +03:00
jonas@perch.ndb.mysql.com
db7a9b760f
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-03-27 10:43:37 +02:00
jonas@perch.ndb.mysql.com
1c019888c3
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-03-27 10:34:21 +02:00
jonas@perch.ndb.mysql.com
49df84ad78
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-03-27 10:31:25 +02:00
jonas@perch.ndb.mysql.com
7f71a8ebab
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2006-03-27 10:21:52 +02:00
jonas@perch.ndb.mysql.com
a3b51fda9f
ndb - autotest
...
Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert()
Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
2006-03-27 10:18:48 +02:00
bpontz@shasta.mysql.com
e4f9d23598
added option for netware build
2006-03-26 21:19:43 -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
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
4d1d8ed335
Follow-up for the fix for bug #18153 "ALTER/OPTIMIZE/REPAIR on transactional
...
tables corrupt triggers".
It turned out that we also have relied at certain places that
(new_table != table_name) were always true on Windows and for transactional
tables. Since our fix for the bug brakes this assumption we have to add new
flag to pass this information around.
This code needs to be refactored but I dare not to do this in 5.0.
2006-03-24 22:46:33 +03:00
jonas@perch.ndb.mysql.com
427a471a47
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-03-24 18:52:31 +01:00
dlenev@mysql.com
e5d5196586
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/mysql-5.0-bg18153
2006-03-24 16:46:37 +03:00
jonas@perch.ndb.mysql.com
1b967adfd0
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-03-24 14:21:45 +01:00
msvensson@neptunus.(none)
5a5afadcb4
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-24 13:56:05 +01:00
jonas@perch.ndb.mysql.com
dbe785a407
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-03-24 13:31:51 +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
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