bar@bar.intranet.mysql.r18.ru
34b15e6a05
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-kt
...
into mysql.com:/usr/home/bar/mysql-5.1-kt
2006-06-19 19:32:08 +05:00
stewart@mysql.com
917203ddd7
BUG#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS,
2006-06-20 00:30:19 +10:00
bar@bar.intranet.mysql.r18.ru
9ea82d3566
Merge mysql.com:/usr/home/bar/mysql-5.1-new.b18396
...
into mysql.com:/usr/home/bar/mysql-5.1-kt
2006-06-19 19:15:03 +05:00
anozdrin@mysql.com
e420873370
Merge mysql.com:/home/alik/MySQL/devel/5.0-rt
...
into mysql.com:/home/alik/MySQL/devel/5.0-tree-merged
2006-06-19 18:10:04 +04:00
gluh@mysql.com
c106b08308
after merge fix
2006-06-19 18:36:27 +05:00
gluh@eagle.intranet.mysql.r18.ru
1d72c66c1b
WL#3015: Logging Improvements - No Restarts(ver N4)
...
Added slow_query_log & general_log global upadatable variables.
Added slow-query-log & general-log startup options.
Added log_output, general_log_file, slow_query_log_file global updatable variables.
2006-06-19 18:30:55 +05:00
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
knielsen@mysql.com
1b7fe10981
Fix a Valgrind leak error report for not freed binlog injector singleton.
2006-06-19 14:31:22 +02:00
serg@serg.mylan
6554329434
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-06-19 13:49:00 +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
anozdrin@mysql.com
7ecfadbcf2
Polishing: C_STRING_WITH_SIZE() was renamed to C_STRING_WITH_LEN().
2006-06-19 15:17:15 +04: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
anozdrin@mysql.com
3b6397b1d2
WL#3298: IM: make command-line option names consistent
...
1. Removed '-P' command line option;
2. Renamed '--passwd' command line option to '--print-password-line'.
2006-06-19 14:41:29 +04: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
lars@dl145j.mysql.com
9bf46d4844
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-06-19 12:14:38 +02: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
monty@mysql.com
49a3334889
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-19 13:00:36 +03:00
monty@mysql.com
860661a2dc
unsigned char -> uchar
...
Added missing copyright
Indentation and prototype fixes
Fixed compiler warning
2006-06-19 12:45:34 +03:00
bar@mysql.com
013fb25ff4
Additional fix for 18201 XML: ExtractValue works even if the xml fragment is not well-formed xml
...
Changing error number
2006-06-19 14:17:04 +05: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
pekka@clam.ndb.mysql.com
1f7b86bf83
ndb - bug#14935 : Correct error to TUX on node alloc fail. There is more bugs with db full.
2006-06-19 10:50:23 +02:00
ramil@mysql.com
49797c23b3
Fix for bug #20496 : func_time.test failure
2006-06-19 13:03:29 +05:00
mats@mysql.com
da98424d6c
Replication/Backup Team Tree test fixing.
2006-06-19 09:25:49 +02:00
bar@bar.intranet.mysql.r18.ru
f3bda9b73f
Merge mysql.com:/usr/home/bar/mysql-5.1-new.b18201
...
into mysql.com:/usr/home/bar/mysql-5.1-kt
2006-06-19 11:18:05 +05:00
evgen@moonbone.local
c0850425e5
rpl_log.test, rpl_stm_log.result:
...
Fixed failing test case
field.cc, item_cmpfunc.cc, select.result:
After merge fix
2006-06-19 04:26:27 +04: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
evgen@moonbone.local
79c91f6214
Manually merged
2006-06-18 14:56:35 +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
serg@serg.mylan
8c4206a31d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-06-17 16:45:25 +02:00
serg@serg.mylan
48c453a40b
atomic ops:
...
my_atomic_XX_t -> intXX, no implicit locking anymore
simplified framework, support for requested cleanups
2006-06-17 16:20:39 +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
5d3aa23d2a
ndb - bug#19285 post merge 5.0->5.1 fix (error codes)
2006-06-17 13:12:38 +02:00
pekka@clam.ndb.mysql.com
adc433484f
Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285
...
into clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug19285
2006-06-17 13:05:31 +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
pekka@clam.ndb.mysql.com
95aa9c28f2
Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285
...
into clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug19285
2006-06-17 11:10:43 +02:00