Alfranio Correia cd4fd3c7c1 merge mysql-5.1 --> mysql-5.5 ...

Conflicts:
  
  . mysql-test/extra/rpl_tests/rpl_insert_ignore.test
  . mysql-test/suite/rpl/t/disabled.def
  . mysql-test/suite/rpl/t/rpl_insert_ignore.test
  . sql/sql_insert.cc
  . sql/sql_repl.cc

2011-01-31 13:11:05 +00:00

..

binlog

Fixed pb failure.

2010-12-20 10:07:35 +01:00

bugs

Bug #58841 Generalise handling of plugins in MTR mysql-test-run.pl script

2011-01-11 14:27:03 +01:00

engines

Modifications in mysql-5.5 engines test suite.

2011-01-05 12:23:05 +05:30

federated

Bug#35333, "If Federated table can't connect to remote host, can't retrieve

2010-11-30 11:20:56 -06:00

funcs_1

merge from 5.1; now this test is not experimental anymore

2010-12-31 12:14:48 +01:00

funcs_2

BUG #59055: RQG was broken after the checkin that removed rpl and rpl_ndb suites. RQG uses MTR V1 and that still has these in the default suite. Removing these from V1. Also removing references to ndb tests in some more disabled.def files

2010-12-21 23:14:48 +05:30

innodb

Merge mysql-5.5 -> mysql-5.5-innodb

2011-01-24 09:42:07 +02:00

jp

WL#2360 Performance schema

2010-01-11 18:47:27 -07:00

large_tests

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

2010-12-19 18:15:12 +01:00

manual

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

parts

merge

2011-01-28 13:28:15 +01:00

perfschema

Bug#42054: SELECT CURDATE() is returning bad value

2011-01-12 18:36:39 -02:00

perfschema_stress

Tests: many if/while expresissons simplified after 57276

2010-11-17 11:16:13 +01:00

rpl

merge mysql-5.1 --> mysql-5.5

2011-01-31 13:11:05 +00:00

stress

Bug #59055 : Remove ndb tests from repository. Removal of tests from sys_vars is pending. It has some issues that are yet to be resolved

2010-12-20 19:49:35 +05:30

sys_vars

Merge of results of the review done in 5.1-bugteam to 5.1.

2011-01-27 08:56:59 +01:00