iggy@recycle.(none)
762eae0bf1
Merge recycle.(none):/src/bug27144/my50-bug27144
...
into recycle.(none):/src/bug27144/my51-bug27144
2007-03-21 14:01:39 -04:00
iggy@recycle.(none)
a763917a6f
Bug#27144 sp-destruct.test is disabled on Windows
...
- Update test to run properly on Windows.
2007-03-21 13:58:11 -04:00
msvensson@pilot.blaudden
fb892abd1f
Merge pilot.blaudden:/home/msvensson/mysql/bug25262/my50-bug25262
...
into pilot.blaudden:/home/msvensson/mysql/bug25262/my51-bug25262
2007-03-21 18:38:08 +01:00
istruewing@chilla.local
c0f03fed94
Merge chilla.local:/home/mydev/mysql-5.0-bug26996
...
into chilla.local:/home/mydev/mysql-5.1-bug26996
2007-03-21 17:38:42 +01:00
tomas@poseidon.mysql.com
2ff03a2267
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-21 16:35:40 +01:00
tomas@poseidon.mysql.com
e1cd5c67dc
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-21 16:34:23 +01:00
cbell/Chuck@mysql_cab_desk.
f0936e9441
Merge mysql_cab_desk.:C:/source/c++/mysql-5.0_BUG_25543
...
into mysql_cab_desk.:C:/source/c++/mysql-5.1_BUG_25543
2007-03-21 10:56:43 -04:00
istruewing@chilla.local
4fdafc545d
Merge chilla.local:/home/mydev/mysql-4.1-bug26996
...
into chilla.local:/home/mydev/mysql-5.0-bug26996
2007-03-21 15:55:14 +01:00
msvensson@pilot.blaudden
a0c2fae01f
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-21 14:34:25 +01:00
msvensson@pilot.blaudden
31b2f339a0
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-21 14:30:47 +01:00
msvensson@pilot.blaudden
7c5df4d35b
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-21 14:24:50 +01:00
aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi
79216dad87
Merge dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-build
...
into dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint
2007-03-21 13:16:03 +02:00
aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi
ac1c81ddcf
Merge dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug26079_binlog_max_innodb
...
into dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint
2007-03-21 13:14:12 +02:00
jani@ua141d10.elisa.omakaista.fi
1165fb5631
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-03-21 11:26:17 +02:00
holyfoot/abotchkov@mysql.com/bk-internal.mysql.com
9d4a0118d8
mysqlbinlog-cp932.test:
...
merging
2007-03-21 09:28:26 +01:00
pekka@clam.ndb.mysql.com/clam.(none)
2e8bec03f7
ndb - bug#24028 in 5.0
...
proper fix exists only in version >= 5.1
2007-03-21 09:13:05 +01:00
tomas@whalegate.ndb.mysql.com
ffb35b80fe
minor fix of ndb cluster startup script
2007-03-21 08:02:11 +01:00
tsmith@quadxeon.mysql.com
9167aabaa3
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
2007-03-20 21:27:45 +01:00
joerg@trift2.
d21bf44517
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into trift2.:/MySQL/M51/test-help-5.1
2007-03-20 21:23:23 +01:00
tsmith@quadxeon.mysql.com
7018d9c5aa
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
2007-03-20 21:12:46 +01:00
joerg@trift2.
16ec3cb361
Merge trift2.:/MySQL/M50/test-help-5.0
...
into trift2.:/MySQL/M51/test-help-5.1
2007-03-20 21:05:57 +01:00
tsmith@quadxeon.mysql.com
2250d1a752
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
2007-03-20 21:05:48 +01:00
tsmith@quadxeon.mysql.com
2670f149d0
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
2007-03-20 20:59:41 +01:00
igor@olga.mysql.com
facd57e5fd
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug27257
2007-03-20 12:20:18 -07:00
joerg@trift2.
30d5fbe5b1
Merge trift2.:/MySQL/M50/test-help-5.0
...
into trift2.:/MySQL/M50/clone-5.0
2007-03-20 19:57:22 +01:00
joerg@trift2.
602ed0a945
Merge trift2.:/MySQL/M41/test-help-4.1
...
into trift2.:/MySQL/M50/test-help-5.0
2007-03-20 19:52:40 +01:00
igor@olga.mysql.com
19da4d3972
Fixed bug #27257 : queries containing subqueries with COUNT(*)
...
aggregated in outer context returned wrong results.
This happened only if the subquery did not contain any references
to outer fields.
As there were no references to outer fields the subquery erroneously
was taken for non-correlated one.
Now any set function aggregated in outer context makes the subquery
correlated.
2007-03-20 11:51:09 -07:00
joerg@trift2.
69a2dcda37
Test "help":
...
Shift the ID values up into a range where they will not collide with those
which we use for real data, when we fill the system tables.
Will be merged up to 5.0 where it is needed for 5.0.38.
2007-03-20 19:36:11 +01:00
joerg@trift2.
54dd7a5112
Merge trift2.:/MySQL/M41/test-help-4.1
...
into trift2.:/MySQL/M50/test-help-5.0
2007-03-20 19:29:46 +01:00
kent@mysql.com/kent-amd64.(none)
0e84886d61
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-20 19:23:20 +01:00
joerg@trift2.
86483de2e5
Test "help":
...
Shift the ID values up into a range where they will not collide with those
which we use for real data, when we fill the system tables.
Will be merged up to 5.0 where it is needed for 5.0.38.
2007-03-20 19:19:17 +01:00
gkodinov/kgeorge@magare.gmz
354c364ad4
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B24484-5.0
2007-03-20 19:49:38 +02:00
gkodinov/kgeorge@macbook.local
28962a76a3
Bug #24484 :
...
To correctly decide which predicates can be evaluated with a given table
the optimizer must know the exact set of tables that a predicate depends
on. If that mask is too wide (refer to non-existing tables) the optimizer
can erroneously skip a predicate.
One such case of wrong table usage mask were the aggregate functions.
The have a all-1 mask (meaning depend on all tables, including non-existent
ones).
Fixed by making a real used_tables mask for the aggregates. The mask is
constructed in the following way :
1. OR the table dependency masks of all the arguments of the aggregate.
2. If all the arguments of the function are from the local name resolution
context and it is evaluated in the same name resolution
context where it is referenced all the tables from that name resolution
context are OR-ed to the dependency mask. This is to denote that an
aggregate function depends on the number of rows it processes.
3. Handle correctly the case of an aggregate function optimization (such that
the aggregate function can be pre-calculated and made a constant).
Made sure that an aggregate function is never a constant (unless subject of a
specific optimization and pre-calculation).
One other flaw was revealed and fixed in the process : references were
not calling the recalculation method for used_tables of their targets.
2007-03-20 19:46:02 +02:00
kent@kent-amd64.(none)
a149769b2d
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-20 17:58:30 +01:00
Kristofer.Pettersson@naruto.
6e4b7ba1fb
Merge naruto.:C:/cpp/bug20777/my51-bug20777
...
into naruto.:C:/cpp/mysql-5.1-runtime
2007-03-20 17:23:28 +01:00
tomas@whalegate.ndb.mysql.com
7bd5241cb4
enabled test case
...
+ some fixes to do the enable
2007-03-20 17:07:53 +01:00
kaa@polly.local
41992a2729
Merge polly.local:/tmp/maint/bug23775/my50-bug23775
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-03-20 17:27:49 +03:00
holyfoot/hf@mysql.com/hfmain.(none)
0233b13572
tests fixed to work in embedded server
2007-03-20 17:53:55 +04:00
kaa@polly.local
24052c23e1
Merge polly.local:/tmp/maint/bug23775/my51-bug23775
...
into polly.local:/tmp/maint/mysql-5.1-maint
2007-03-20 15:48:25 +03:00
msvensson@pilot.blaudden
3dbc0f7852
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-20 11:23:17 +01:00
msvensson@pilot.blaudden
80fb08310e
Bug#27070 server logs are created unrequested and in wrong directory
...
- Avoid defaault log file names looking like <hostname>.pid.slow.log
by using the FN_REPLACE_EXT flag to 'fn_format'
- Remove the default log files generated by log_state.test before
test completes
2007-03-20 11:21:27 +01:00
msvensson@pilot.blaudden
d640af1881
Update test reulst after setting logging to be sent both to file and tables
2007-03-20 11:17:07 +01:00
msvensson@pilot.blaudden
68df4cbc5a
Bug#27070 server logs are created unrequested and in wrong directory
...
- Setting up a A->B->A replication causes relay logs being written
by the master, remove them when test is finished
2007-03-20 11:15:15 +01:00
aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi
7c22049dfa
Bug #26079 max_binlog_size + innodb = not make new binlog and hang server
...
There was hanging at binlog_commit by a thread executing autocommit query.
The hang appeared to be due to an overly condtion for early return
from binlog_commit introduced by bug#20265 fix.
Fixed with reverting the logic back to 5.0 version.
2007-03-20 10:50:10 +02:00
mats@romeo.(none)
6a01170299
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
...
into romeo.(none):/home/bk/b22583-mysql-5.1-new-rpl
2007-03-20 09:35:56 +01:00
tsmith@quadxeon.mysql.com
f1b1eb030b
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-03-20 09:00:38 +01:00
tsmith@quadxeon.mysql.com
9ff0553f7a
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-03-20 08:57:55 +01:00
mats@romeo.(none)
d695f74955
BUG#22583: RBR between MyISAM and non-MyISAM tables containing a BIT
...
field does not work
Fix to prevent MyISAM from reading data from NULL BLOB.
Fix to make record comparison independent of values of unused bits in
record.
Updating binlog positions in tests.
2007-03-20 08:52:01 +01:00
gni/root@dev3-221.dev.cn.tlan
61dd58beb3
BUG#21699 DROP last DATAFILE from TABLESPACE even though there are still table in it. And it gives the cofusing error message.
2007-03-20 10:36:20 +08:00
tsmith@quadxeon.mysql.com
0eae26ef57
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-03-19 23:36:38 +01:00