← Back to team overview

maria-developers team mailing list archive

bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2764)

 

#At lp:maria

 2764 knielsen@xxxxxxxxxxxxxxx	2009-11-10
      Apply Monty's fix for warning about wrong FEDERATED typecode.
      modified:
        storage/federatedx/ha_federatedx.cc

=== modified file 'storage/federatedx/ha_federatedx.cc'
--- a/storage/federatedx/ha_federatedx.cc	2009-11-03 11:08:09 +0000
+++ b/storage/federatedx/ha_federatedx.cc	2009-11-10 08:35:39 +0000
@@ -390,8 +390,8 @@ int federatedx_db_init(void *p)
   DBUG_ENTER("federatedx_db_init");
   handlerton *federatedx_hton= (handlerton *)p;
   federatedx_hton->state= SHOW_OPTION_YES;
-  /* This is no longer needed for plugin storage engines */
-  federatedx_hton->db_type= DB_TYPE_DEFAULT;
+  /* Needed to work with old .frm files */
+  federatedx_hton->db_type= DB_TYPE_FEDERATED_DB;
   federatedx_hton->savepoint_offset= sizeof(ulong);
   federatedx_hton->close_connection= ha_federatedx::disconnect;
   federatedx_hton->savepoint_set= ha_federatedx::savepoint_set;