Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:

bzr branch mysql-5.1-performance-version mysql-trunk # Summit
cd mysql-trunk
bzr merge mysql-5.1-innodb_plugin # which is 5.1 + Innodb plugin 
bzr rm innobase # remove the builtin
Next step: build, test fixes.

2 files changed, 22 insertions, 34 deletions

diff --git a/storage/federated/CMakeLists.txt b/storage/federated/CMakeLists.txt
index b96f68a3c37..fa54d36481a 100644
--- a/storage/federated/CMakeLists.txt
+++ b/storage/federated/CMakeLists.txt
@@ -13,16 +13,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
-SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
-
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/sql
-                    ${CMAKE_SOURCE_DIR}/regex
-                    ${CMAKE_SOURCE_DIR}/extra/yassl/include)
-
+INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake")
 SET(FEDERATED_SOURCES  ha_federated.cc)
-
-IF(NOT SOURCE_SUBLIBS)
-  ADD_LIBRARY(federated ${FEDERATED_SOURCES})
-  ADD_DEPENDENCIES(federated GenError)
-ENDIF(NOT SOURCE_SUBLIBS)
+MYSQL_STORAGE_ENGINE(FEDERATED)
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index e22e342c65e..a3fa42d7d05 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
@@ -2856,34 +2856,32 @@ int ha_federated::info(uint flag)
     if (!(row= mysql_fetch_row(result)))
       goto error;
 
-    if (flag & (HA_STATUS_VARIABLE | HA_STATUS_CONST))
-    {
-      /*
-        deleted is set in ha_federated::info
-      */
-      /*
-        need to figure out what this means as far as federated is concerned,
-        since we don't have a "file"
+    /*
+      deleted is set in ha_federated::info
+    */
+    /*
+      need to figure out what this means as far as federated is concerned,
+      since we don't have a "file"
 
-        data_file_length = ?
-        index_file_length = ?
-        delete_length = ?
-      */
-      if (row[4] != NULL)
-        stats.records=   (ha_rows) my_strtoll10(row[4], (char**) 0,
+      data_file_length = ?
+      index_file_length = ?
+      delete_length = ?
+    */
+    if (row[4] != NULL)
+      stats.records=   (ha_rows) my_strtoll10(row[4], (char**) 0,
                                                        &error);
-      if (row[5] != NULL)
-        stats.mean_rec_length= (ulong) my_strtoll10(row[5], (char**) 0, &error);
+    if (row[5] != NULL)
+      stats.mean_rec_length= (ulong) my_strtoll10(row[5], (char**) 0, &error);
 
-      stats.data_file_length= stats.records * stats.mean_rec_length;
+    stats.data_file_length= stats.records * stats.mean_rec_length;
 
-      if (row[12] != NULL)
-        stats.update_time=     (time_t) my_strtoll10(row[12], (char**) 0,
+    if (row[12] != NULL)
+      stats.update_time=     (ulong) my_strtoll10(row[12], (char**) 0,
                                                       &error);
-      if (row[13] != NULL)
-        stats.check_time=      (time_t) my_strtoll10(row[13], (char**) 0,
+    if (row[13] != NULL)
+      stats.check_time=      (ulong) my_strtoll10(row[13], (char**) 0,
                                                       &error);
-    }
+
     /*
       size of IO operations (This is based on a good guess, no high science
       involved)