monty@mysql.com
c3e7c7aa4b
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/my/mysql-5.1
2006-03-29 17:28:40 +03:00
monty@mysql.com
1994ed49ec
Fixed compiler and valgrind warnings
...
Added missing DBUG_xxx_RETURN statements
Fixed some usage of not initialized variables (as found by valgrind)
Ensure that we don't remove locked tables used as name locks from open table cache until unlock_table_names() are called.
This was fixed by having drop_locked_name() returning any table used as a name lock so that we can free it in unlock_table_names()
This will allow Tomas to continue with his work to use namelocks to syncronize things.
Note: valgrind still produces a lot of warnings about using not initialized code and shows memory loss errors when running the ndb tests
2006-03-29 14:27:36 +03:00
dlenev@mysql.com
41a895a1ce
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mysql.com:/home/dlenev/mysql-5.0-bg17764
2006-03-29 14:55:04 +04:00
dlenev@mysql.com
17785d169b
Proposed fix for bug #17764 "Trigger crashes MyISAM table"
...
A table with an on insert trigger was reported as crashed when the insert
was processed with bulk insert mode on (handler::start_bulk_insert).
The trigger was also selecting from the same table, and that caused
the "crash".
The same problem was present when an insert statement, which was processed
in bulk mode, also used a stored function that was reading the same table.
This fix disables bulk inserts if a statement uses functions or invokes
triggers. Implementing more granular checks will require much more code and
therefore can hardly be done in 5.0
2006-03-29 14:53:00 +04:00
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
mikael@c-bc0be253.1238-1-64736c10.cust.bredbandsbolaget.se
bcd2a795d8
BUG#13520: BUG#13433: Fixed proper delimiters for fields and comments
2006-03-28 17:41:50 -05:00
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
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
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
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
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
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
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
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
mats@mysql.com
3fd8cfe57c
Bug#18436 (RBR: Replication to partition engine triggers assertion on slave):
...
Switching to using index_read() instead of index_read_idx() since a
range of rows need to be retrieved.
2006-03-27 14:58: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