mariadb/storage
Konstantin Osipov a72f90bc43 Merge next-mr -> next-4284.
mysql-test/t/disabled.def:
  Restore disabled ssl tests: SSL certificates were updated.
  Disable sp_sync.test, the test case can't work in next-4284.
mysql-test/t/partition_innodb.test:
  Disable parsing of the test case for Bug#47343, 
  the test can not work in next-4284.
mysql-test/t/ps_ddl.test:
  Update results (CREATE TABLE IF NOT EXISTS takes
  into account existence of the temporary table).
2010-02-06 13:28:06 +03:00
..
archive Manual merge from mysql-trunk-merge. 2010-01-28 01:13:10 +03:00
blackhole WL#2360 Performance schema 2009-12-04 18:26:15 -07:00
csv Merge mysql-next-mr to mysql-next-mr-svoj. 2009-12-09 15:03:34 +04:00
example merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2010-01-07 15:39:11 +00:00
federated WL#2360 Performance schema 2009-12-09 20:19:51 -07:00
heap WL#4738 streamline/simplify @@variable creation process 2009-12-22 10:35:56 +01:00
ibmdb2i Manual merge from mysql-next-mr. 2009-12-22 09:32:58 +03:00
innobase Merge next-mr -> next-4284. 2010-02-02 12:22:17 +03:00
myisam Merge next-mr -> next-4284 2010-02-03 16:43:03 +03:00
myisammrg Merge next-mr -> next-4284. 2010-02-06 13:28:06 +03:00
ndb Manual merge from mysql-trunk-merge. 2010-01-28 01:13:10 +03:00
perfschema Merge next-mr -> next-4284-merge. 2010-02-04 20:34:15 +03:00
Makefile.am Backport WL#3653 to 5.1 to enable bundled innodb plugin. 2009-06-10 10:59:49 +02:00
mysql_storage_engine.cmake WL#4903 Plugin Service API part I 2009-11-02 21:05:42 +01:00