bzr push into mysql-6.0-falcon branch (svoj:2812 to 2813)

[Sergey Vojtovich]

 2813 Sergey Vojtovich	2008-09-04
      This is an addition to
      
      WL#4515 - Falcon: fill INFORMATION_SCHEMA.FILES
      
      It fixes various issues caused by that patch:
      - Disable ABI check until it is ready.
      - Do not attempt to dump Falcon tablespaces, as mysqldump
        cannot handle them properly yet.
      - Fixed ndb_dd_dump test case, so it queries I_S.FILES for
        ndbcluster files only.
modified:
  Makefile.am
  client/mysqldump.c
  mysql-test/suite/ndb/r/ndb_dd_dump.result
  mysql-test/suite/ndb/t/ndb_dd_dump.test

 2812 Kevin Lewis	2008-09-03
      Various code cleanup changes
modified:
  storage/falcon/RecoveryObjects.cpp
  storage/falcon/SerialLog.cpp
  storage/falcon/SerialLog.h
  storage/falcon/StorageHandler.cpp
  storage/falcon/StorageTableShare.cpp
  storage/falcon/Table.cpp
  storage/falcon/Transaction.cpp
  storage/falcon/Transaction.h
  storage/falcon/ha_falcon.cpp
  storage/falcon/ha_falcon.h

=== modified file 'Makefile.am'
--- a/Makefile.am	2008-07-24 11:55:49 +0000
+++ b/Makefile.am	2008-09-04 09:22:16 +0000
@@ -63,7 +63,8 @@ dist-hook:
 		--datadir=$(distdir)/win/data \
 		--srcdir=$(top_srcdir)
 
-all-local:		abi_check
+# TODO: uncomment abi_check (next line) if you get a merge conflict here.
+#all-local:		abi_check
 
 tags:
 	support-files/build-tags

=== modified file 'client/mysqldump.c'
--- a/client/mysqldump.c	2008-05-29 15:44:11 +0000
+++ b/client/mysqldump.c	2008-09-04 09:22:16 +0000
@@ -3684,6 +3684,7 @@ static int dump_tablespaces(char* ts_whe
                       " EXTRA"
                       " FROM INFORMATION_SCHEMA.FILES"
                       " WHERE FILE_TYPE = 'UNDO LOG'"
+                      " AND ENGINE != 'Falcon'"
                       " AND FILE_NAME IS NOT NULL",
                       256, 1024);
   if(ts_where)
@@ -3780,7 +3781,8 @@ static int dump_tablespaces(char* ts_whe
                       " INITIAL_SIZE,"
                       " ENGINE"
                       " FROM INFORMATION_SCHEMA.FILES"
-                      " WHERE FILE_TYPE = 'DATAFILE'",
+                      " WHERE FILE_TYPE = 'DATAFILE'"
+                      " AND ENGINE != 'Falcon'",
                       256, 1024);
 
   if(ts_where)

=== modified file 'mysql-test/suite/ndb/r/ndb_dd_dump.result'
--- a/mysql-test/suite/ndb/r/ndb_dd_dump.result	2007-11-22 14:46:54 +0000
+++ b/mysql-test/suite/ndb/r/ndb_dd_dump.result	2008-09-04 09:22:16 +0000
@@ -182,7 +182,8 @@ FILE_NAME,
 EXTENT_SIZE,
 INITIAL_SIZE,
 ENGINE
-FROM INFORMATION_SCHEMA.FILES WHERE FILE_TYPE="DATAFILE" ORDER BY FILE_NAME;
+FROM INFORMATION_SCHEMA.FILES WHERE FILE_TYPE="DATAFILE"
+AND ENGINE='ndbcluster' ORDER BY FILE_NAME;
 TABLESPACE_NAME	LOGFILE_GROUP_NAME	FILE_NAME	EXTENT_SIZE	INITIAL_SIZE	ENGINE
 ts1	lg1	datafile_ts1_01.dat	1048576	2097152	ndbcluster
 ts1	lg1	datafile_ts1_02.dat	1048576	1048576	ndbcluster

=== modified file 'mysql-test/suite/ndb/t/ndb_dd_dump.test'
--- a/mysql-test/suite/ndb/t/ndb_dd_dump.test	2007-08-21 19:22:35 +0000
+++ b/mysql-test/suite/ndb/t/ndb_dd_dump.test	2008-09-04 09:22:16 +0000
@@ -211,7 +211,8 @@ SELECT DISTINCT
   EXTENT_SIZE,
   INITIAL_SIZE,
   ENGINE
-FROM INFORMATION_SCHEMA.FILES WHERE FILE_TYPE="DATAFILE" ORDER BY FILE_NAME;
+FROM INFORMATION_SCHEMA.FILES WHERE FILE_TYPE="DATAFILE"
+AND ENGINE='ndbcluster' ORDER BY FILE_NAME;
 
 SELECT COUNT(*) FROM t1;
 SELECT COUNT(*) FROM t2;