He Zhenxing
6f84951044
Merge BUG#43263 from 5.0-bugteam to 5.1-bugteam
2009-05-31 13:44:41 +08:00
Patrick Crews
c86055b325
Bug#41307: Tests using include/ndb_backup.inc won't work on Windows due to 'grep' call.
...
Re-recording of .result files for additional tests that use this include file.
2009-03-16 17:36:14 -04:00
Patrick Crews
783cae1831
merge 5.0 -> 5.1
...
These are only 5.0's fixes being merged.
5.1 and 6.0 Unix-removals will occur in different patches.
2009-02-19 18:24:25 -05:00
Andrei Elkin
2618337eb6
merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging.
...
mysql_upgrade results changed due to the error messesge of mysqlcheck has changed.
2008-11-12 19:51:47 +02:00
Mattias Jonsson
abd09620db
Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output
...
The partitioning clause is only a very long single line, which is very
hard to interpret for a human. This patch breaks the partitioning
syntax into one line for the partitioning type, and one line per
partition/subpartition.
2008-11-04 08:43:21 +01:00
Mats Kindahl
1f29c52581
Merging 5.1 main into 5.1-rpl
2008-10-23 21:27:09 +02:00
Patrick Crews
99abc81c5f
Merge 5.0 -> 5.1
2008-09-30 15:32:35 -04:00
msvensson@pilot.mysql.com
56a354794c
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
2008-02-28 12:21:44 +01:00
joerg@trift2.
25ab6afc03
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2008-02-22 16:14:27 +01:00
msvensson@pilot.mysql.com
d80b1ae384
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
2008-02-21 14:11:01 +01:00
tomas@poseidon.bredbandsbolaget.se
fe9ee5c7bf
correct merge error
2008-02-14 00:02:25 +01:00
tomas@poseidon.bredbandsbolaget.se
3f95d153f6
correction of merge
2008-02-13 20:52:01 +01:00
tomas@whalegate.ndb.mysql.com
4846306921
correct result file
2008-01-04 16:49:39 +01:00
tomas@whalegate.ndb.mysql.com
24be420c23
Bug#32648 Test failure between NDB Cluster and other engines
2008-01-04 15:33:01 +01:00
tomas@whalegate.ndb.mysql.com
5e9c092c5d
move randomly failing tests to ndb_team suite
2007-12-11 19:57:26 +01:00
tomas@whalegate.ndb.mysql.com
78fb6b274b
moving these tests to suite ndb_team
2007-09-05 19:13:36 +02:00
