From: Date: September 28 2008 6:02pm Subject: bzr push into mysql-6.0-falcon-team branch (hky:2835 to 2839) Bug#39707 List-Archive: http://lists.mysql.com/commits/54629 X-Bug: 39707 Message-Id: <20080928160232.B5792123818@lu0011.efendi.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 2839 Hakan Kuecuekyilmaz 2008-09-28 Fixed Bug#39707 Falcon fails to start when --falcon-page-size=1K Minimum falcon_page_size is 2k. removed: mysql-test/suite/falcon/t/falcon_page_size_1-master.opt modified: storage/falcon/StorageParameters.h 2838 Hakan Kuecuekyilmaz 2008-09-28 Project: Make Vlad Happy. Rescued another test case from falcon_team suite. renamed: mysql-test/suite/falcon_team/r/falcon_bug_34351_C.result => mysql-test/suite/falcon/r/falcon_bug_34351_C.result mysql-test/suite/falcon_team/t/falcon_bug_34351_C.test => mysql-test/suite/falcon/t/falcon_bug_34351_C.test 2837 Hakan Kuecuekyilmaz 2008-09-28 Cleanup. modified: mysql-test/suite/falcon_team/r/falcon_bug_34351_C.result mysql-test/suite/falcon_team/t/falcon_bug_34351_C.test mysql-test/suite/falcon_team/t/test2bug.def 2836 Hakan Kuecuekyilmaz 2008-09-28 Removed read_many_rows_falcon because original test is unreliable and fails. See Bug 39705 for details. removed: mysql-test/suite/falcon_team/r/read_many_rows_falcon.result mysql-test/suite/falcon_team/t/read_many_rows_falcon.test 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 === renamed file 'mysql-test/suite/falcon_team/r/falcon_bug_34351_C.result' => 'mysql-test/suite/falcon/r/falcon_bug_34351_C.result' --- a/mysql-test/suite/falcon_team/r/falcon_bug_34351_C.result 2008-04-24 04:09:39 +0000 +++ b/mysql-test/suite/falcon/r/falcon_bug_34351_C.result 2008-09-28 08:07:30 +0000 @@ -35,7 +35,5 @@ CALL p1(); CALL p1(); # Switch to connection default # Pull the results of the preceeding call p1() -SELECT count(*) FROM t1; -count(*) -0 DROP PROCEDURE p1; +DROP TABLE t1; === renamed file 'mysql-test/suite/falcon_team/t/falcon_bug_34351_C.test' => 'mysql-test/suite/falcon/t/falcon_bug_34351_C.test' --- a/mysql-test/suite/falcon_team/t/falcon_bug_34351_C.test 2008-04-24 04:09:39 +0000 +++ b/mysql-test/suite/falcon/t/falcon_bug_34351_C.test 2008-09-28 08:07:30 +0000 @@ -1,4 +1,5 @@ --source include/have_falcon.inc + # # Bug #34351_C: Update Conflict on non-overlapping transactions # This test works because it uses FALCON_CONSISTENT_READ=OFF @@ -30,8 +31,6 @@ CREATE TABLE t1 ( PRIMARY KEY (t1_autoinc), key(t1_uuid) ) ENGINE = Falcon; -# declare continue handler for sqlexception - delimiter //; CREATE PROCEDURE p1 () begin @@ -77,14 +76,14 @@ connection default; --echo # Pull the results of the preceeding call p1() --reap - # ----------------------------------------------------- # # --- Check --- # # ----------------------------------------------------- # # Checking row count is not applicable here. -SELECT count(*) FROM t1; +#SELECT count(*) FROM t1; # ----------------------------------------------------- # # --- Final cleanup --- # # ----------------------------------------------------- # DROP PROCEDURE p1; +DROP TABLE t1; === removed file 'mysql-test/suite/falcon/t/falcon_page_size_1-master.opt' --- a/mysql-test/suite/falcon/t/falcon_page_size_1-master.opt 2007-11-28 18:46:31 +0000 +++ b/mysql-test/suite/falcon/t/falcon_page_size_1-master.opt 1970-01-01 00:00:00 +0000 @@ -1 +0,0 @@ ---loose-falcon_page_size=1024 === removed file 'mysql-test/suite/falcon_team/r/read_many_rows_falcon.result' --- a/mysql-test/suite/falcon_team/r/read_many_rows_falcon.result 2008-04-20 00:05:17 +0000 +++ b/mysql-test/suite/falcon_team/r/read_many_rows_falcon.result 1970-01-01 00:00:00 +0000 @@ -1,35 +0,0 @@ -SET SESSION STORAGE_ENGINE = Falcon; -DROP TABLE IF EXISTS t1, t2, t3, t4; -CREATE TABLE t1 (id INTEGER) ENGINE=MyISAM; -CREATE TABLE t2 (id INTEGER PRIMARY KEY); -CREATE TABLE t3 (a CHAR(32) PRIMARY KEY,id INTEGER); -CREATE TABLE t4 (a CHAR(32) PRIMARY KEY,id INTEGER) ENGINE=MyISAM; -INSERT INTO t1 (id) VALUES (1); -INSERT INTO t1 SELECT id+1 FROM t1; -INSERT INTO t1 SELECT id+2 FROM t1; -INSERT INTO t1 SELECT id+4 FROM t1; -INSERT INTO t1 SELECT id+8 FROM t1; -INSERT INTO t1 SELECT id+16 FROM t1; -INSERT INTO t1 SELECT id+32 FROM t1; -INSERT INTO t1 SELECT id+64 FROM t1; -INSERT INTO t1 SELECT id+128 FROM t1; -INSERT INTO t1 SELECT id+256 FROM t1; -INSERT INTO t1 SELECT id+512 FROM t1; -INSERT INTO t1 SELECT id+1024 FROM t1; -INSERT INTO t1 SELECT id+2048 FROM t1; -INSERT INTO t1 SELECT id+4096 FROM t1; -INSERT INTO t1 SELECT id+8192 FROM t1; -INSERT INTO t1 SELECT id+16384 FROM t1; -INSERT INTO t1 SELECT id+32768 FROM t1; -INSERT INTO t1 SELECT id+65536 FROM t1; -INSERT INTO t1 SELECT id+131072 FROM t1; -INSERT INTO t1 SELECT id+262144 FROM t1; -INSERT INTO t1 SELECT id+524288 FROM t1; -INSERT INTO t1 SELECT id+1048576 FROM t1; -INSERT INTO t2 SELECT * FROM t1; -INSERT INTO t3 SELECT CONCAT(id),id FROM t2 ORDER BY -id; -INSERT INTO t4 SELECT * FROM t3 ORDER BY CONCAT(a); -SELECT SUM(id) FROM t3; -SUM(id) -2199024304128 -DROP TABLE t1,t2,t3,t4; === removed file 'mysql-test/suite/falcon_team/t/read_many_rows_falcon.test' --- a/mysql-test/suite/falcon_team/t/read_many_rows_falcon.test 2008-04-20 00:05:17 +0000 +++ b/mysql-test/suite/falcon_team/t/read_many_rows_falcon.test 1970-01-01 00:00:00 +0000 @@ -1,15 +0,0 @@ -# t/read_many_rows_falcon.test -# -# Check how filesort and buffered-record-reads works with InnoDB. -# This test takes a long time. -# -# Last update: -# 2006-08-30 ML create this test -# - - ---source include/have_falcon.inc -let $engine_type= Falcon; -let $other_engine_type= MyISAM; - ---source include/read_many_rows.inc === modified file 'mysql-test/suite/falcon_team/t/test2bug.def' --- a/mysql-test/suite/falcon_team/t/test2bug.def 2008-09-27 07:52:18 +0000 +++ b/mysql-test/suite/falcon_team/t/test2bug.def 2008-09-28 07:16:36 +0000 @@ -21,3 +21,4 @@ falcon_bug_23945: Bug#34892 - Transactio falcon_bug_26433: Bug#39314 - falcon_bug_26433 fails with an offset of 1 in row numbers in expected warnings falcon_bug_28048: Bug#36700 - Running falcon_bug_28048 shows increasing memory usage and run time falcon_bug_34892: Bug#34892 - Transaction handling in select_create::abort let's Falcon fail +falcon_deadlock: Bug#34182 - SELECT ... FOR UPDATE does not lock when in subquery === modified file 'storage/falcon/StorageParameters.h' --- a/storage/falcon/StorageParameters.h 2008-07-10 19:00:14 +0000 +++ b/storage/falcon/StorageParameters.h 2008-09-28 11:32:52 +0000 @@ -21,7 +21,7 @@ PARAMETER_UINT(index_chill_threshold, "B PARAMETER_UINT(io_threads, "Number of Falcon I/O threads", 2, 2, 20, 0, NULL) PARAMETER_UINT(large_blob_threshold, "Threshold for large blobs", 0, 160000, INT_MAX, 0, NULL) PARAMETER_UINT(lock_wait_timeout, "Transaction lock time period (seconds)", 0, 50, INT_MAX, 0, NULL) -PARAMETER_UINT(page_size, "The page size used when creating a Falcon tablespace.", 1024, 4096, 32768, 0x0200, NULL) +PARAMETER_UINT(page_size, "The page size used when creating a Falcon tablespace.", 2048, 4096, 32768, 0x0200, NULL) PARAMETER_UINT(record_chill_threshold, "Bytes of pending record data that is 'frozen' to the Falcon serial log.", 1, 5*1024*1024, 1024*1024*1024, 0, &updateRecordChillThreshold) PARAMETER_UINT(record_scavenge_floor, "A percentage of falcon_record_memory_threshold that defines the amount of record data that will remain in the record cache after a scavenge run.", 10, 50, 90, 0x2000, &StorageInterface::updateRecordScavengeFloor) PARAMETER_UINT(record_scavenge_threshold, "The percentage of falcon_record_memory_max that will cause the scavenger thread to start scavenging records from the record cache.", 10, 67, 100, 0x2000, &StorageInterface::updateRecordScavengeThreshold)