Michael Widenius 988d263e25 Merge with main

2011-02-22 20:28:01 +02:00

..

disabled.def

fix federated_server test, possible null ptr deref

2009-11-04 03:11:04 -08:00

federated_archive.result

Added federatedx storage engine

2009-10-30 20:50:56 +02:00

federated_archive.test

…

federated_bug_13118.result

Added federatedx storage engine

2009-10-30 20:50:56 +02:00

federated_bug_13118.test

…

federated_bug_25714.result

Added federatedx storage engine

2009-10-30 20:50:56 +02:00

federated_bug_25714.test

fixed system_mysql_db_fix30020 test faiilure

2009-02-02 13:36:03 +02:00

federated_bug_32426.result

Added verbose mode to recovery

2010-08-18 10:52:57 +03:00

federated_bug_32426.test

Added verbose mode to recovery

2010-08-18 10:52:57 +03:00

federated_bug_35333.result

Merge with MySQL 5.1.55

2011-02-20 18:51:43 +02:00

federated_bug_35333.test

Merge with MySQL 5.1.55

2011-02-20 18:51:43 +02:00

federated_bug_585688.result

Applied patch for lp:585688 "maridb crashes in federatedx code" from lp:~atcurtis/maria/federatedx:

2011-02-10 22:40:59 +02:00

federated_bug_585688.test

Applied patch for lp:585688 "maridb crashes in federatedx code" from lp:~atcurtis/maria/federatedx:

2011-02-10 22:40:59 +02:00

federated_cleanup.inc

Added federatedx storage engine

2009-10-30 20:50:56 +02:00

federated_debug-master.opt

Manual merge.

2009-09-30 19:25:06 -03:00

federated_debug.result

Merge with MySQL 5.1, with following additions:

2009-11-11 13:17:49 +02:00

federated_debug.test

Speed up mtr --parallel=<lots> by scheduling some slow tests earlier.

2011-01-03 15:33:39 +01:00

federated_innodb.result

Added federatedx storage engine

2009-10-30 20:50:56 +02:00

federated_innodb.test

…

federated_partition-slave.opt

Applied patch for lp:585688 "maridb crashes in federatedx code" from lp:~atcurtis/maria/federatedx:

2011-02-10 22:40:59 +02:00

federated_partition.result

Fixed bug in federatedx patch that caused partition tests to fail.

2011-02-11 04:28:22 +02:00

federated_partition.test

Fixed bug in federatedx patch that caused partition tests to fail.

2011-02-11 04:28:22 +02:00

federated_server.result

Fix for LP#571200 MySQL Bug#32426: FederatedX corrupt ORDER BY with TEXT

2010-08-12 20:52:52 +03:00

federated_server.test

Fixed wrong error message from federatedx (which could lead to assert in DBUG code)

2010-07-16 16:43:46 +03:00

federated_transactions.result

Added federatedx storage engine

2009-10-30 20:50:56 +02:00

federated_transactions.test

…

federated.inc

fixed system_mysql_db_fix30020 test faiilure

2009-02-02 13:36:03 +02:00

federated.result

Merge MySQL 5.1.46 into MariaDB.

2010-04-28 14:52:24 +02:00

federated.test

Merge MySQL 5.1.46 into MariaDB.

2010-04-28 14:52:24 +02:00

have_federated_db.inc

…

my.cnf

mtr changes:

2010-08-25 22:22:33 +02:00

suite.opt

mtr changes:

2010-08-25 22:22:33 +02:00