Merge bk@192.168.21.1:mysql-5.0-opt

into  mysql.com:/home/hf/work/30638/my50-30638

include/config-win.h

@@ -33,6 +33,7 @@ functions */
 #include <io.h>
 #include <malloc.h>
 
+#define BIG_TABLES 1
 #define HAVE_SMEM 1
 
 #if defined(_WIN64) || defined(WIN64) 

sql/ha_federated.cc

@@ -2528,7 +2528,12 @@ int ha_federated::info(uint flag)
     status_query_string.length(0);
 
     result= mysql_store_result(mysql);
-    if (!result)
+
+    /*
+      We're going to use fields num. 4, 12 and 13 of the resultset,
+      so make sure we have these fields.
+    */
+    if (!result || (mysql_num_fields(result) < 14))
       goto error;
 
     if (!mysql_num_rows(result))