Merge MariaDB 10.0-base to MariaDB 10.0

This commit is contained in:
unknown 2012-12-18 15:01:58 +01:00
commit 701419b02f
225 changed files with 10935 additions and 1682 deletions

View file

@ -124,8 +124,6 @@ private:
public:
ha_federated(handlerton *hton, TABLE_SHARE *table_arg);
~ha_federated() {}
/* The name that will be used for display purposes */
const char *table_type() const { return "FEDERATED"; }
/*
Next pointer used in transaction
*/