bzr push into mysql-6.0-falcon-team branch (hky:2833 to 2835)

[Hakan Kuecuekyilmaz]

 2835 Hakan Kuecuekyilmaz	2008-09-28
      Refactored test case.
modified:
  mysql-test/suite/falcon_team/r/falcon_bug_36294.result
  mysql-test/suite/falcon_team/t/falcon_bug_36294.test

 2834 Hakan Kuecuekyilmaz	2008-09-27
      Fix for Bug#39574 Falcon asserts after crash in DataPage.cpp line 87.
modified:
  storage/falcon/DataPage.h

 2833 Hakan Kuecuekyilmaz	2008-09-27 [merge]
      Merge.
removed:
  mysql-test/suite/falcon_team/r/falcon_bug_23692.result
  mysql-test/suite/falcon_team/t/falcon_bug_23692.test
added:
  mysql-test/suite/falcon_team/t/test2bug.def
renamed:
  mysql-test/suite/falcon_team/r/falcon_bug_30282.result =>
mysql-test/suite/falcon/r/falcon_bug_30282.result
  mysql-test/suite/falcon_team/t/falcon_bug_30282.test =>
mysql-test/suite/falcon/t/falcon_bug_30282.test
modified:
  mysql-test/suite/falcon/t/falcon_bug_39692.test
  mysys/stacktrace.c
  storage/falcon/Cache.cpp

=== modified file 'mysql-test/suite/falcon_team/r/falcon_bug_36294.result'
--- a/mysql-test/suite/falcon_team/r/falcon_bug_36294.result	2008-04-25 09:44:03 +0000
+++ b/mysql-test/suite/falcon_team/r/falcon_bug_36294.result	2008-09-27 22:01:35 +0000
@@ -1 +1,8 @@
-hello,world
+*** Bug #36294 ***
+SET @@storage_engine = 'Falcon';
+DROP TABLE IF EXISTS ftest;
+CREATE TABLESPACE gimdata ADD DATAFILE 'gimdata.fts' ENGINE 'Falcon';
+CREATE TABLE ftest (id serial, col1 varchar(500)) ENGINE 'Falcon' TABLESPACE gimdata;
+Hello, world!
+DROP TABLE ftest;
+DROP TABLESPACE gimdata ENGINE 'Falcon';

=== modified file 'mysql-test/suite/falcon_team/t/falcon_bug_36294.test'
--- a/mysql-test/suite/falcon_team/t/falcon_bug_36294.test	2008-04-27 01:34:10 +0000
+++ b/mysql-test/suite/falcon_team/t/falcon_bug_36294.test	2008-09-27 22:01:35 +0000
@@ -1,52 +1,66 @@
 --source include/have_falcon.inc
+
 #
 # Bug#36294: Assertion in Cache::writePage
 #    This test produces no output. It is only here to crash the server
 #    once insert/select runs into error 305 (record memory exhaused).
 #    Exact point of crash is generally unpredictable.
 #
+--echo *** Bug #36294 ***
+
+# ----------------------------------------------------- #
+# --- Initialisation                                --- #
+# ----------------------------------------------------- #
 let $engine = 'Falcon';
 eval SET @@storage_engine = $engine;
 
+--disable_warnings
+DROP TABLE IF EXISTS ftest;
+--enable_warnings
+
+eval CREATE TABLESPACE gimdata ADD DATAFILE 'gimdata.fts' ENGINE $engine;
+eval CREATE TABLE ftest (id serial, col1 varchar(500)) ENGINE $engine TABLESPACE gimdata;
+
+# ----------------------------------------------------- #
+# --- Test                                          --- #
+# ----------------------------------------------------- #
 --disable_abort_on_error
 --disable_warnings
 --disable_query_log
-drop table if exists ftest;
-create tablespace gimdata add datafile 'gimdata.fts' engine=$engine;
-create table ftest (id serial, col1 varchar(500)) engine=$engine tablespace gimdata;
-insert into ftest values (null,repeat("a",500));
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-drop table ftest;
-drop tablespace gimdata engine=$engine;
+INSERT INTO ftest VALUES (null,repeat("a",500));
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
 --enable_warnings
 --enable_abort_on_error
 --enable_query_log
+
 # ----------------------------------------------------- #
 # --- Check                                         --- #
 # ----------------------------------------------------- #
---echo hello,world
+--echo Hello, world!
 
 # ----------------------------------------------------- #
 # --- Final cleanup                                 --- #
 # ----------------------------------------------------- #
+DROP TABLE ftest;
+eval DROP TABLESPACE gimdata ENGINE $engine;

=== modified file 'storage/falcon/DataPage.h'
--- a/storage/falcon/DataPage.h	2008-06-17 17:41:54 +0000
+++ b/storage/falcon/DataPage.h	2008-09-27 18:37:54 +0000
@@ -35,8 +35,8 @@ struct RecordIndex;
 struct SectionAnalysis;
 
 struct LineIndex {
-	short		offset;
-	short		length;				// negative means record has overflow page
+	uint16		offset;
+	int16		length;				// negative means record has overflow page
 	};
 
 class DataPage : public Page