bk commit into 6.0 tree (hakank:1.2595)

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0 repository of hakank.  When hakank does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-03-12 22:45:30+01:00, hakank@lu0011.(none) +2 -0
  Disabled failing test and fixed a gcc warning.

  mysql-test/suite/falcon/t/disabled.def@stripped, 2008-03-12 22:45:23+01:00, hakank@lu0011.(none) +1 -0
    Disabled failing test.

  storage/falcon/BackLog.h@stripped, 2008-03-12 22:45:23+01:00, hakank@lu0011.(none) +1 -1
    Fixed gcc warning.

diff -Nrup a/mysql-test/suite/falcon/t/disabled.def b/mysql-test/suite/falcon/t/disabled.def
--- a/mysql-test/suite/falcon/t/disabled.def	2008-03-12 22:14:18 +01:00
+++ b/mysql-test/suite/falcon/t/disabled.def	2008-03-12 22:45:23 +01:00
@@ -11,6 +11,7 @@
 ##############################################################################
 
 falcon_bug_22150    : Bug#34890 2008-02-27 hakank Open bug
+falcon_bug_22165    : Bug#35255 2008-03-12 hakank Open bug
 falcon_bug_22166    : Bug#22166 2006-08-24 hakank Open bug
 falcon_bug_22169    : Bug#22169 2006-08-24 hakank Too long run time for PB
 falcon_bug_22182    : Disabled until runtime team provides RENAME DATABASE replacement. See WL#4030
diff -Nrup a/storage/falcon/BackLog.h b/storage/falcon/BackLog.h
--- a/storage/falcon/BackLog.h	2008-03-07 16:27:51 +01:00
+++ b/storage/falcon/BackLog.h	2008-03-12 22:45:23 +01:00
@@ -18,7 +18,7 @@
 
 //#define DEBUG_BACKLOG
 
-static const char *BACKLOG_FILE		= "_falcon_backlog.fts";
+#define BACKLOG_FILE		"_falcon_backlog.fts"
 
 class Database;
 class Dbb;