bk commit into 5.1-falcon tree (hakank:1.2612) BUG#27767

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
5.1-falcon repository of hakan. When hakan 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, 2007-04-18 09:49:29+02:00, hakank@stripped +6 -0
  Test for Bug#27767 is currently failing.
  
  Adjusted results file for Falcon's I_S tables.

  mysql-test/r/falcon_bug_27767.result@stripped, 2007-04-18 09:49:26+02:00,
hakank@stripped +25 -0
    Test for Bug#27767 is currently failing.

  mysql-test/r/falcon_bug_27767.result@stripped, 2007-04-18 09:49:26+02:00,
hakank@stripped +0 -0

  mysql-test/r/information_schema.result@stripped, 2007-04-18 09:49:26+02:00,
hakank@stripped +17 -13
    Adjusted result file for Falcon I_S tables.

  mysql-test/r/information_schema_db.result@stripped, 2007-04-18 09:49:26+02:00,
hakank@stripped +5 -4
    Adjusted result file for Falcon I_S tables.

  mysql-test/r/mysqlshow.result@stripped, 2007-04-18 09:49:26+02:00, hakank@stripped
+10 -8
    Adjusted result file for Falcon I_S tables.

  mysql-test/t/disabled.def@stripped, 2007-04-18 09:49:26+02:00, hakank@stripped
+1 -0
    Test for Bug#27767 is currently failing.

  mysql-test/t/falcon_bug_27767.test@stripped, 2007-04-18 09:49:26+02:00,
hakank@stripped +48 -0
    Test for Bug#27767 is currently failing.

  mysql-test/t/falcon_bug_27767.test@stripped, 2007-04-18 09:49:26+02:00,
hakank@stripped +0 -0

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	hakank
# Host:	lu0011.wdf.sap.corp
# Root:	/home/hakan/work/mysql/mysql-5.1-falcon

--- 1.151/mysql-test/r/information_schema.result	2007-04-13 01:24:26 +02:00
+++ 1.152/mysql-test/r/information_schema.result	2007-04-18 09:49:26 +02:00
@@ -63,14 +63,15 @@
 TRIGGERS
 USER_PRIVILEGES
 VIEWS
-FALCON_SERIAL_LOG
+FALCON_RECORD_CACHE_SUMMARY
 FALCON_SYSTEM_MEMORY_DETAIL
 FALCON_SYSTEM_MEMORY_SUMMARY
-FALCON_RECORD_CACHE_SUMMARY
+FALCON_SYNCOBJECTS
 FALCON_RECORD_CACHE_DETAIL
-FALCON_TRANSACTIONS
+FALCON_TRANSACTION_SUMMARY
 FALCON_DATABASE_IO
-FALCON_SYNCOBJECTS
+FALCON_TRANSACTIONS
+FALCON_SERIAL_LOG
 columns_priv
 db
 event
@@ -860,7 +861,7 @@
 flush privileges;
 SELECT table_schema, count(*) FROM information_schema.TABLES where
table_name<>'ndb_binlog_index' AND table_name<>'ndb_apply_status' GROUP BY
TABLE_SCHEMA;
 table_schema	count(*)
-information_schema	35
+information_schema	36
 mysql	22
 create table t1 (i int, j int);
 create trigger trg1 before insert on t1 for each row
@@ -1272,14 +1273,15 @@
 TRIGGERS	TRIGGER_SCHEMA
 USER_PRIVILEGES	GRANTEE
 VIEWS	TABLE_SCHEMA
-FALCON_SERIAL_LOG	DATABASE
+FALCON_RECORD_CACHE_SUMMARY	TOTAL_SPACE
 FALCON_SYSTEM_MEMORY_DETAIL	FILE
 FALCON_SYSTEM_MEMORY_SUMMARY	TOTAL_SPACE
-FALCON_RECORD_CACHE_SUMMARY	TOTAL_SPACE
+FALCON_SYNCOBJECTS	WHERE
 FALCON_RECORD_CACHE_DETAIL	FILE
-FALCON_TRANSACTIONS	DATABASE
+FALCON_TRANSACTION_SUMMARY	DATABASE
 FALCON_DATABASE_IO	DATABASE
-FALCON_SYNCOBJECTS	WHERE
+FALCON_TRANSACTIONS	DATABASE
+FALCON_SERIAL_LOG	DATABASE
 SELECT t.table_name, c1.column_name
 FROM information_schema.tables t
 INNER JOIN
@@ -1322,14 +1324,15 @@
 TRIGGERS	TRIGGER_SCHEMA
 USER_PRIVILEGES	GRANTEE
 VIEWS	TABLE_SCHEMA
-FALCON_SERIAL_LOG	DATABASE
+FALCON_RECORD_CACHE_SUMMARY	TOTAL_SPACE
 FALCON_SYSTEM_MEMORY_DETAIL	FILE
 FALCON_SYSTEM_MEMORY_SUMMARY	TOTAL_SPACE
-FALCON_RECORD_CACHE_SUMMARY	TOTAL_SPACE
+FALCON_SYNCOBJECTS	WHERE
 FALCON_RECORD_CACHE_DETAIL	FILE
-FALCON_TRANSACTIONS	DATABASE
+FALCON_TRANSACTION_SUMMARY	DATABASE
 FALCON_DATABASE_IO	DATABASE
-FALCON_SYNCOBJECTS	WHERE
+FALCON_TRANSACTIONS	DATABASE
+FALCON_SERIAL_LOG	DATABASE
 SELECT MAX(table_name) FROM information_schema.tables;
 MAX(table_name)
 VIEWS
@@ -1411,6 +1414,7 @@
 FALCON_SYSTEM_MEMORY_DETAIL	information_schema.FALCON_SYSTEM_MEMORY_DETAIL	1
 FALCON_SYSTEM_MEMORY_SUMMARY	information_schema.FALCON_SYSTEM_MEMORY_SUMMARY	1
 FALCON_TRANSACTIONS	information_schema.FALCON_TRANSACTIONS	1
+FALCON_TRANSACTION_SUMMARY	information_schema.FALCON_TRANSACTION_SUMMARY	1
 FILES	information_schema.FILES	1
 GLOBAL_STATUS	information_schema.GLOBAL_STATUS	1
 GLOBAL_VARIABLES	information_schema.GLOBAL_VARIABLES	1

--- 1.20/mysql-test/r/information_schema_db.result	2007-04-13 01:24:26 +02:00
+++ 1.21/mysql-test/r/information_schema_db.result	2007-04-18 09:49:26 +02:00
@@ -32,14 +32,15 @@
 TRIGGERS
 USER_PRIVILEGES
 VIEWS
-FALCON_SERIAL_LOG
+FALCON_RECORD_CACHE_SUMMARY
 FALCON_SYSTEM_MEMORY_DETAIL
 FALCON_SYSTEM_MEMORY_SUMMARY
-FALCON_RECORD_CACHE_SUMMARY
+FALCON_SYNCOBJECTS
 FALCON_RECORD_CACHE_DETAIL
-FALCON_TRANSACTIONS
+FALCON_TRANSACTION_SUMMARY
 FALCON_DATABASE_IO
-FALCON_SYNCOBJECTS
+FALCON_TRANSACTIONS
+FALCON_SERIAL_LOG
 show tables from INFORMATION_SCHEMA like 'T%';
 Tables_in_information_schema (T%)
 TABLES
--- New file ---
+++ mysql-test/r/falcon_bug_27767.result	07/04/18 09:49:26
*** Bug #27767 ***
SET @@storage_engine = 'Falcon';
DROP SCHEMA IF EXISTS db1;
SET @@autocommit = 0;
CREATE SCHEMA db1;
USE db1;
CREATE TABLE t1 (a int);
CREATE INDEX i1 on t1 (a);
INSERT INTO t1 VALUES (7);
COMMIT;
# Establish connection conn1
SET storage_engine = 'Falcon';
SET @@autocommit = 0;
USE db1;
START TRANSACTION;
SELECT * FROM t1 WHERE a = 7 FOR UPDATE;
a
7
COMMIT;
# Switch to connection default
SELECT count(*) FROM t1;
count(*)
1
DROP SCHEMA db1;
USE test;

--- New file ---
+++ mysql-test/t/falcon_bug_27767.test	07/04/18 09:49:26
#
# Bug #27767: Falcon: crash after select for update
#
--echo *** Bug #27767 ***

# ----------------------------------------------------- #
# --- Initialisation                                --- #
# ----------------------------------------------------- #
let $engine = 'Falcon';
eval SET @@storage_engine = $engine;

--disable_warnings
DROP SCHEMA IF EXISTS db1;
--enable_warnings

SET @@autocommit = 0;
CREATE SCHEMA db1;
USE db1;
CREATE TABLE t1 (a int);
CREATE INDEX i1 on t1 (a);
INSERT INTO t1 VALUES (7);
COMMIT;

# ----------------------------------------------------- #
# --- Test                                          --- #
# ----------------------------------------------------- #
--echo # Establish connection conn1
connect (conn1,localhost,root,,);
eval SET storage_engine = $engine;
SET @@autocommit = 0;
USE db1;
START TRANSACTION;
SELECT * FROM t1 WHERE a = 7 FOR UPDATE;
COMMIT;

# ----------------------------------------------------- #
# --- Check                                         --- #
# ----------------------------------------------------- #
--echo # Switch to connection default
connection default;
SELECT count(*) FROM t1;

# ----------------------------------------------------- #
# --- Final cleanup                                 --- #
# ----------------------------------------------------- #
disconnect conn1;
DROP SCHEMA db1;
USE test;


--- 1.7/mysql-test/r/mysqlshow.result	2007-04-13 01:24:26 +02:00
+++ 1.8/mysql-test/r/mysqlshow.result	2007-04-18 09:49:26 +02:00
@@ -106,14 +106,15 @@
 | TRIGGERS                              |
 | USER_PRIVILEGES                       |
 | VIEWS                                 |
-| FALCON_SERIAL_LOG                     |
+| FALCON_RECORD_CACHE_SUMMARY           |
 | FALCON_SYSTEM_MEMORY_DETAIL           |
 | FALCON_SYSTEM_MEMORY_SUMMARY          |
-| FALCON_RECORD_CACHE_SUMMARY           |
+| FALCON_SYNCOBJECTS                    |
 | FALCON_RECORD_CACHE_DETAIL            |
-| FALCON_TRANSACTIONS                   |
+| FALCON_TRANSACTION_SUMMARY            |
 | FALCON_DATABASE_IO                    |
-| FALCON_SYNCOBJECTS                    |
+| FALCON_TRANSACTIONS                   |
+| FALCON_SERIAL_LOG                     |
 +---------------------------------------+
 Database: INFORMATION_SCHEMA
 +---------------------------------------+
@@ -146,14 +147,15 @@
 | TRIGGERS                              |
 | USER_PRIVILEGES                       |
 | VIEWS                                 |
-| FALCON_SERIAL_LOG                     |
+| FALCON_RECORD_CACHE_SUMMARY           |
 | FALCON_SYSTEM_MEMORY_DETAIL           |
 | FALCON_SYSTEM_MEMORY_SUMMARY          |
-| FALCON_RECORD_CACHE_SUMMARY           |
+| FALCON_SYNCOBJECTS                    |
 | FALCON_RECORD_CACHE_DETAIL            |
-| FALCON_TRANSACTIONS                   |
+| FALCON_TRANSACTION_SUMMARY            |
 | FALCON_DATABASE_IO                    |
-| FALCON_SYNCOBJECTS                    |
+| FALCON_TRANSACTIONS                   |
+| FALCON_SERIAL_LOG                     |
 +---------------------------------------+
 Wildcard: inf_rmation_schema
 +--------------------+

--- 1.301/mysql-test/t/disabled.def	2007-04-17 21:18:45 +02:00
+++ 1.302/mysql-test/t/disabled.def	2007-04-18 09:49:26 +02:00
@@ -80,6 +80,7 @@
 falcon_bug_27426    : Bug#27426 2007-03-27 hakank Currently failing
 falcon_bug_27697    : Bug#27697 2007-04-07 hakank Currently failing
 falcon_bug_27722    : Bug#27722 2007-04-10 hakank Currently failing
+falcon_bug_27767    : Bug#27767 2007-04-18 hakank Currently failing
 falcon_bug_27895    : Bug#27895 2007-04-17 hakank Currently failing
 falcon_page_size_1  : Bug#23220 2007-02-19 hakank Currently failing
 falcon_page_size_2  : Bug#23220 2007-02-19 hakank Currently failing