maria-developers team mailing list archive

[knielsen@xxxxxxxxxxxxxxx]

#At lp:maria

 2765 knielsen@xxxxxxxxxxxxxxx	2009-11-13 [merge]
      Merge XtraDB 8.
      modified:
        storage/federatedx/Makefile.am
        storage/federatedx/ha_federatedx.cc

=== modified file 'storage/federatedx/Makefile.am'
--- a/storage/federatedx/Makefile.am	2009-11-01 15:09:55 +0000
+++ b/storage/federatedx/Makefile.am	2009-11-10 13:55:48 +0000
@@ -22,7 +22,6 @@ pkgplugin_LTLIBRARIES =	@plugin_federate
 ha_federatedx_la_LDFLAGS =	-module -rpath $(pkgplugindir)
 ha_federatedx_la_CXXFLAGS=	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_federatedx_la_CFLAGS =	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-ha_federatedx_la_SOURCES =	ha_federatedx.cc
 
 
 EXTRA_LIBRARIES =	libfederatedx.a

=== 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;