msvensson@shellback.(none)
|
bd6fc1ce66
|
Merge shellback.(none):/home/msvensson/mysql/work/my51-work
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
|
2006-09-19 19:10:31 +02:00 |
|
igor@rurik.mysql.com
|
25368c359e
|
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
into rurik.mysql.com:/home/igor/mysql-5.0-opt
|
2006-09-19 10:09:02 -07:00 |
|
msvensson@shellback.(none)
|
d8870f2bb3
|
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into shellback.(none):/home/msvensson/mysql/work/my51-work
|
2006-09-19 18:41:48 +02:00 |
|
msvensson@shellback.(none)
|
883a3809c9
|
Pass --debug arguments to mysqld also when bootstrapping if --debug is tunrned on
|
2006-09-19 18:39:04 +02:00 |
|
gkodinov/kgeorge@rakia.(none)
|
2da037c7d5
|
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into rakia.(none):/home/kgeorge/mysql/autopush/B21540-5.0-opt
|
2006-09-19 19:18:52 +03:00 |
|
msvensson@shellback.(none)
|
ee5ca6e231
|
Merge shellback.(none):/home/msvensson/mysql/work/my51-work
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
|
2006-09-19 17:47:53 +02:00 |
|
msvensson@shellback.(none)
|
1b3094187a
|
Fix warnings in mysql-test-run.pl
|
2006-09-19 17:45:27 +02:00 |
|
igor@rurik.mysql.com
|
294c0ccaa9
|
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
into rurik.mysql.com:/home/igor/mysql-4.1-opt
|
2006-09-19 08:42:58 -07:00 |
|
msvensson@shellback.(none)
|
1515818276
|
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
|
2006-09-19 17:40:49 +02:00 |
|
msvensson@shellback.(none)
|
0e7d18d8e4
|
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into shellback.(none):/home/msvensson/mysql/work/my51-work
|
2006-09-19 17:08:07 +02:00 |
|
msvensson@shellback.(none)
|
895d986266
|
Don't bother to remove the pid_file in mtr_kill_leftovers as it could potentially remove a the pidfile before the process is killed.
The pid file will be removed later when var/ directory is recreated.
|
2006-09-19 16:48:01 +02:00 |
|
msvensson@shellback.(none)
|
fa26e83fd2
|
Fix warnings in mysql-test-run.pl
|
2006-09-19 16:43:42 +02:00 |
|
mats@romeo.(none)
|
0d019e0380
|
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl
|
2006-09-19 13:47:15 +02:00 |
|
mikael/pappa@dator5.(none)
|
fb2ad12f1d
|
Merge dator5.(none):/home/pappa/clean-mysql-5.1
into dator5.(none):/home/pappa/bug21210
|
2006-09-19 07:44:18 -04:00 |
|
thek@kpdesk.mysql.com
|
f8dbb2dd3b
|
Merge kpdesk.mysql.com:/home/thek/dev2/bug21139/my50-bug21139
into kpdesk.mysql.com:/home/thek/dev2/mysql-5.0-maint
|
2006-09-19 12:45:04 +02:00 |
|
thek@kpdesk.mysql.com
|
59671a1b16
|
Merge kpdesk.mysql.com:/home/thek/dev2/bug21139/my41-bug21139
into kpdesk.mysql.com:/home/thek/dev2/mysql-4.1-maint
|
2006-09-19 12:44:09 +02:00 |
|
thek@kpdesk.mysql.com
|
a2467400b7
|
Merge kpdesk.mysql.com:/home/thek/dev2/bug21139/my50-bug21139
into kpdesk.mysql.com:/home/thek/dev2/bug21139/my51-bug21139
|
2006-09-19 12:42:44 +02:00 |
|
thek@kpdesk.mysql.com
|
b4908ed35d
|
Merge kpdesk.mysql.com:/home/thek/dev2/bug21139/my41-bug21139
into kpdesk.mysql.com:/home/thek/dev2/bug21139/my50-bug21139
|
2006-09-19 12:41:15 +02:00 |
|
thek@kpdesk.mysql.com
|
66fa757e1f
|
Bug#21139 Handling of database differs in "embedded" , test lowercase_fs_off fails
- Access checks are omitted when compliled without --with-embedded-privilege-control
- Patch: skip this test
|
2006-09-19 12:40:31 +02:00 |
|
mskold/marty@linux.site
|
e3c7886768
|
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
|
2006-09-19 11:34:03 +02:00 |
|
mskold/marty@mysql.com/linux.site
|
e8abf51de1
|
Bug #18679 rpl_ndb_dd_advance.test fails randomly
|
2006-09-19 11:31:55 +02:00 |
|
stewart@willster.(none)
|
6ff9664d46
|
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into willster.(none):/home/stewart/Documents/MySQL/5.1/bug20073
|
2006-09-19 18:36:18 +10:00 |
|
acurtis/antony@xiphis.org/ltamd64.xiphis.org
|
844df8f085
|
post merge fixes
|
2006-09-18 15:52:16 -07:00 |
|
acurtis/antony@ltamd64.xiphis.org
|
424857e0e4
|
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into xiphis.org:/home/antony/work2/engines-merge
|
2006-09-18 12:16:03 -07:00 |
|
mats@romeo.(none)
|
78ad0eee91
|
Fixing and checking result for mysqldump test.
|
2006-09-18 21:09:48 +02:00 |
|
msvensson@shellback.(none)
|
db1adb2234
|
Fix merge error, path_mysock has been renamed to path_sock
|
2006-09-18 19:38:59 +02:00 |
|
msvensson@shellback.(none)
|
7dabd8c683
|
Merge shellback.(none):/home/msvensson/mysql/work/my51-work
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
|
2006-09-18 18:06:10 +02:00 |
|
msvensson@shellback.(none)
|
8244e4fb73
|
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into shellback.(none):/home/msvensson/mysql/work/my51-work
|
2006-09-18 18:04:47 +02:00 |
|
msvensson@shellback.(none)
|
781aaaba66
|
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
|
2006-09-18 17:47:26 +02:00 |
|
msvensson@shellback.(none)
|
dafb50055f
|
Add character-sets-dir argument to "mysql". That avoids a local
installed charset dir being used.
|
2006-09-18 17:46:36 +02:00 |
|
stewart@willster.(none)
|
49eb41e09d
|
BUG#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS,
Change things around so that we add a row for each log file group that lists
the free space for that log file group.
|
2006-09-19 01:44:32 +10:00 |
|
svoj@april.(none)
|
36be4318da
|
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
|
2006-09-18 20:43:36 +05:00 |
|
svoj@may.pils.ru
|
43097593e3
|
Merge may.pils.ru:/home/svoj/devel/mysql/merge/mysql-4.1
into may.pils.ru:/home/svoj/devel/mysql/merge/mysql-4.1-engines
|
2006-09-18 20:35:33 +05:00 |
|
gkodinov@dl145s.mysql.com
|
cf9d1c9152
|
Merge bk-internal:/home/bk/mysql-5.0
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
|
2006-09-18 19:01:07 +04:00 |
|
mleich@three.local.lan
|
5f5d1507ec
|
1. Cumulated fix for Bug#22398, #22404 and #22405
2. Correct some logical bugs within the tests, which were caused by
automatic resolve of BitKeeper
|
2006-09-18 16:55:56 +02:00 |
|
svoj@april.(none)
|
419a51c5a5
|
Merge april.(none):/home/svoj/devel/bk/mysql-5.1
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
|
2006-09-18 19:43:33 +05:00 |
|
gkodinov@dl145s.mysql.com
|
c1035c210b
|
Merge bk-internal:/home/bk/mysql-5.1-opt
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
|
2006-09-18 18:33:11 +04:00 |
|
gkodinov@dl145s.mysql.com
|
f1100c007d
|
merge fixes
|
2006-09-18 18:30:51 +04:00 |
|
rburnett@bk-internal.mysql.com
|
98d4ea5b7a
|
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
|
2006-09-18 15:38:34 +02:00 |
|
msvensson@shellback.(none)
|
45a8c28498
|
Fix spelling error in Makefile
|
2006-09-18 13:24:03 +02:00 |
|
svoj@april.(none)
|
f21eadfc74
|
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
|
2006-09-18 16:23:45 +05:00 |
|
mskold/marty@linux.site
|
dd1c43ba2a
|
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
|
2006-09-18 13:11:03 +02:00 |
|
mskold/marty@mysql.com/linux.site
|
d1fd23b1c9
|
Bug #21378 Alter table from X storage engine to NDB could cause data loss: added show tables to ensure tables are gone
|
2006-09-18 13:00:21 +02:00 |
|
gkodinov@dl145s.mysql.com
|
ce8ed889d7
|
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
|
2006-09-18 12:57:20 +02:00 |
|
sergefp@mysql.com
|
13901802bc
|
BUG#22393: Very wrong E(#rows(ref(const)) for key with skewed distribution
- Check if we have E(#rows) for 'range' access on the smaller interval
on the same index. If yes, adjust the estimate.
|
2006-09-18 14:49:54 +04:00 |
|
msvensson@shellback.(none)
|
16c07bd02c
|
No need to use environment variable NDB_STATUS_OK and NDB_SLAVE_STATUS_OK anymore
when mysql-test-run.pl has full control of all ndb processes. It will now know if
install has failed.
|
2006-09-18 12:45:04 +02:00 |
|
msvensson@shellback.(none)
|
60b395a950
|
Remove extra semicolon
|
2006-09-18 12:24:10 +02:00 |
|
gkodinov@dl145s.mysql.com
|
2ec485f06e
|
Merge bk-internal:/home/bk/mysql-5.0-opt
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
|
2006-09-18 12:20:20 +02:00 |
|
gkodinov@dl145s.mysql.com
|
fae596aafd
|
merge fixes
|
2006-09-18 12:14:27 +02:00 |
|
evgen@moonbone.local
|
f42385e0d1
|
disabled.def:
Enabled rpl_sp_effects test due to fixed bug.
|
2006-09-18 13:53:30 +04:00 |
|