anozdrin@mysql.com
4afffb40a8
Merge mysql.com:/home/alik/MySQL/devel/5.0-tree
...
into mysql.com:/home/alik/MySQL/devel/5.0-rt
2006-06-19 16:57:46 +04:00
svoj@may.pils.ru
2c28b3cbf1
Addition to fix for
...
BUG#18036 - update of table joined to self reports table as crashed
Set exclude_from_table_unique_test value back to FALSE. It is needed for
further check in multi_update::prepare whether to use record cache.
2006-06-19 17:50:52 +05:00
cmiller@bk-internal.mysql.com
b0ebd2fce0
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-maint
2006-06-19 14:38:57 +02:00
lars@mysql.com
ad809c6b15
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-06-19 13:30:54 +02:00
lars@mysql.com
67e476f29f
BUG#17201 Changed to other database (BUG#20531 hinders usage of 'test' database)
2006-06-19 13:23:13 +02:00
svoj@may.pils.ru
8d802218fb
Merge april:devel/BitKeeper/mysql-5.0-engines
...
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0
2006-06-19 16:11:23 +05:00
svoj@may.pils.ru
6a90aede13
Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1
...
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0
2006-06-19 16:06:29 +05:00
gkodinov@mysql.com
6777928eec
Merge mysql.com:/home/kgeorge/mysql/4.1/teamclean
...
into mysql.com:/home/kgeorge/mysql/4.1/B9676
2006-06-19 13:25:28 +03:00
gkodinov@mysql.com
c5ed7a87f4
* Bug #9676 : INSERT INTO x SELECT .. FROM x LIMIT 1; slows down with big
...
tables
Currently in INSERT ... SELECT ... LIMIT ... the compiler uses a
temporary table to store the results of SELECT ... LIMIT .. and then
uses that table as a source for INSERT. The problem is that in some cases
it actually skips the LIMIT clause in doing that and materializes the
whole SELECT result set regardless of the LIMIT.
This fix is limiting the process of filling up the temp table with only
that much rows that will be actually used by propagating the LIMIT value.
2006-06-19 13:22:42 +03:00
anozdrin@mysql.com
a992833d83
The second fix for BUG#19391: IM fails to start after two executions.
2006-06-19 14:16:10 +04:00
anozdrin@mysql.com
a142a4d97b
Small fix for test suite:
...
- fix for IM stopping routine;
- polishing.
2006-06-19 14:15:26 +04:00
anozdrin@mysql.com
2e56e82180
Fix of test suite in scope of fixing BUG#18023: IM: instance
...
can be started several times; monitor interval must be > 2sec
2006-06-19 14:13:34 +04:00
lars@mysql.com
5937422a53
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-06-19 12:09:24 +02:00
lars@mysql.com
ba3e825e21
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-06-19 12:06:54 +02:00
svoj@may.pils.ru
737e166403
Merge april:devel/BitKeeper/mysql-4.1
...
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1
2006-06-19 14:13:44 +05:00
svoj@may.pils.ru
37cdb0fbf3
BUG#18036 - update of table joined to self reports table as crashed
...
Certain updates of table joined to self results in unexpected
behavior.
The problem was that record cache was mistakenly enabled for
self-joined table updates. Normally record cache must be disabled
for such updates.
Fixed wrong condition in code that determines whether to use
record cache for self-joined table updates.
Only MyISAM tables were affected.
2006-06-19 14:05:14 +05:00
ramil@mysql.com
49797c23b3
Fix for bug #20496 : func_time.test failure
2006-06-19 13:03:29 +05:00
evgen@moonbone.local
92b4a73a20
Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-06-19 03:50:09 +04:00
evgen@moonbone.local
a92a55bb97
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-06-19 01:16:18 +04:00
evgen@moonbone.local
c02e6f2a5b
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-06-18 20:48:48 +04:00
pekka@clam.ndb.mysql.com
ff66be2629
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into clam.ndb.mysql.com:/space/pekka/ndb/version/my50
2006-06-17 17:33:08 +02:00
kent@mysql.com
b95c0c4edd
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-06-17 15:42:24 +02:00
kent@mysql.com
ad87e7b314
Makefile.am:
...
Avoid error message trying 'windoze-dsp' in obsolete directory
compile-dist:
Avoid error message for target 'distclean' and no Makefile
2006-06-17 15:37:23 +02:00
pekka@clam.ndb.mysql.com
61dd500900
Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50
...
into clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285
2006-06-17 13:53:43 +02:00
pekka@clam.ndb.mysql.com
35416445da
ndb - bug#19285 minor fixes
2006-06-17 13:00:17 +02:00
kent@mysql.com
cae47f4b20
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-06-17 11:38:16 +02:00
kent@mysql.com
6783fc830f
make_win_src_distribution.sh:
...
Make output less verbose
Make temporary directory name unique
Remove temporary directory on interrupt
2006-06-17 11:33:34 +02:00
kent@mysql.com
1b7d4cacfb
make_win_src_distribution.sh:
...
Don't try copy non existing extra/{sql_state,mysqld_error}.h
2006-06-17 10:44:52 +02:00
kent@mysql.com
10833287ef
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-06-17 03:13:22 +02:00
kent@mysql.com
eadd351031
make_win_src_distribution.sh:
...
Include "sql_yacc.yy" for completeness (bug#20387)
2006-06-17 03:04:43 +02:00
kent@mysql.com
ed6ff12315
Merge
2006-06-17 02:05:48 +02:00
evgen@moonbone.local
09e84bf484
Merge moonbone.local:/work/tmp_merge-5.0
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-06-17 03:35:10 +04:00
evgen@moonbone.local
1aedd2ed3e
Manually merged
2006-06-17 02:57:50 +04:00
evgen@moonbone.local
59b204fe08
select.result:
...
After merge fix
2006-06-17 02:52:14 +04:00
kent@mysql.com
392bb51f25
configure.in, net_serv.cc, compile-netware-END:
...
Changes for Netware
2006-06-17 00:30:02 +02:00
evgen@moonbone.local
7f24667598
Manually merged
2006-06-17 02:11:12 +04:00
evgen@moonbone.local
592e080643
Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-06-17 01:57:25 +04:00
evgen@moonbone.local
28cf3c3e64
Manually merged
2006-06-17 00:58:36 +04:00
kent@mysql.com
5a242ffc4f
.del-mysql_install.def~8da659e7c0f7e571:
...
Delete: netware/mysql_install.def
Makefile.am:
Removed obsolete "mysql_install.def"
2006-06-16 22:29:52 +02:00
evgen@moonbone.local
b8b9738e0b
item_strfunc.cc:
...
Fix for bug#16716 for --ps-protocol mode.
item_cmpfunc.cc:
Fix for a memory allocation/freeing problem in agg_cmp_type() after fix
for bug#16377. Few language corrections.
2006-06-16 23:46:37 +04:00
dlenev@mysql.com
59d20e26d5
Fix for bug#13479 "REPLACE activates UPDATE trigger, not the DELETE and
...
INSERT triggers".
In cases when REPLACE was internally executed via update and table had
on update (on delete) triggers defined we exposed the fact that such
optimization used by callng on update (not calling on delete) triggers.
Such behavior contradicts our documentation which describes REPLACE as
INSERT with optional DELETE.
This fix just disables this optimization for tables with on delete triggers.
The optimization is still applied for tables which have on update but have
no on delete triggers, we just don't invoke on update triggers in this case
and thus don't expose information about optimization to user.
Also added test coverage for values returned by ROW_COUNT() function (and
thus for values returned by mysql_affected_rows()) for various forms of
INSERT.
2006-06-16 20:21:25 +04:00
msvensson@neptunus.(none)
104748ddaf
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-06-16 17:30:03 +02:00
msvensson@neptunus.(none)
0a15f9d0bf
Set default valgrind options to "-v --show-reachable=yes" and make it possible to override that with --valgrind-options
2006-06-16 15:56:08 +02:00
ramil@mysql.com
8a4ff6374b
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2006-06-16 16:51:07 +05:00
ramil@mysql.com
10914578f1
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2006-06-16 16:43:44 +05:00
stewart@mysql.com
a145882944
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/main
2006-06-16 21:36:17 +10:00
stewart@mysql.com
b5165c371e
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/main
2006-06-16 21:01:02 +10:00
ramil@mysql.com
7e8a2ec6bb
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2006-06-16 15:27:04 +05:00
ramil@mysql.com
f2899063ee
after-merge fixes.
2006-06-16 14:05:58 +05:00
serg@serg.mylan
816bd73362
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2006-06-16 10:01:13 +02:00