bk commit into 5.1-falcon tree (hakank:1.2618) BUG#27951

[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-19 18:38:16+02:00, hakank@stripped +5 -0
  New test case for failing Bug#27951.

  mysql-test/r/falcon_bug_27767.result@stripped, 2007-04-19 18:38:13+02:00,
hakank@stripped +1 -5
    Simplified test case.

  mysql-test/r/falcon_bug_27951.result@stripped, 2007-04-19 18:38:13+02:00,
hakank@stripped +9 -0
    New BitKeeper file ``mysql-test/r/falcon_bug_27951.result''

  mysql-test/r/falcon_bug_27951.result@stripped, 2007-04-19 18:38:13+02:00,
hakank@stripped +0 -0

  mysql-test/t/disabled.def@stripped, 2007-04-19 18:38:13+02:00, hakank@stripped
+1 -0
    Added new test for open bug.

  mysql-test/t/falcon_bug_27767.test@stripped, 2007-04-19 18:38:13+02:00,
hakank@stripped +1 -5
    Simplified test case

  mysql-test/t/falcon_bug_27951.test@stripped, 2007-04-19 18:38:13+02:00,
hakank@stripped +41 -0
    New BitKeeper file ``mysql-test/t/falcon_bug_27951.test''

  mysql-test/t/falcon_bug_27951.test@stripped, 2007-04-19 18:38:13+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.1/mysql-test/r/falcon_bug_27767.result	2007-04-18 09:49:26 +02:00
+++ 1.2/mysql-test/r/falcon_bug_27767.result	2007-04-19 18:38:13 +02:00
@@ -1,9 +1,7 @@
 *** Bug #27767 ***
 SET @@storage_engine = 'Falcon';
-DROP SCHEMA IF EXISTS db1;
+DROP TABLE IF EXISTS t1;
 SET @@autocommit = 0;
-CREATE SCHEMA db1;
-USE db1;
 CREATE TABLE t1 (a int);
 CREATE INDEX i1 on t1 (a);
 INSERT INTO t1 VALUES (7);
@@ -11,7 +9,6 @@
 # Establish connection conn1
 SET storage_engine = 'Falcon';
 SET @@autocommit = 0;
-USE db1;
 START TRANSACTION;
 SELECT * FROM t1 WHERE a = 7 FOR UPDATE;
 a
@@ -21,5 +18,4 @@
 SELECT count(*) FROM t1;
 count(*)
 1
-DROP SCHEMA db1;
 USE test;
--- New file ---
+++ mysql-test/r/falcon_bug_27951.result	07/04/19 18:38:13
*** Bug #27951 ***
SET @@storage_engine = 'Falcon';
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a serial, b varchar(500));
INSERT INTO t1 (b) VALUES (repeat('a', 500));
SELECT count(*) FROM t1;
count(*)
65536
DROP TABLE t1;


--- 1.1/mysql-test/t/falcon_bug_27767.test	2007-04-18 09:49:26 +02:00
+++ 1.2/mysql-test/t/falcon_bug_27767.test	2007-04-19 18:38:13 +02:00
@@ -10,12 +10,10 @@
 eval SET @@storage_engine = $engine;
 
 --disable_warnings
-DROP SCHEMA IF EXISTS db1;
+DROP TABLE IF EXISTS t1;
 --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);
@@ -28,7 +26,6 @@
 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;
@@ -44,5 +41,4 @@
 # --- Final cleanup                                 --- #
 # ----------------------------------------------------- #
 disconnect conn1;
-DROP SCHEMA db1;
 USE test;
--- New file ---
+++ mysql-test/t/falcon_bug_27951.test	07/04/19 18:38:13
--source include/have_innodb.inc
#
# Bug #27951: Falcon crashes with insert into..select from
#
--echo *** Bug #27951 ***

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

--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings

CREATE TABLE t1 (a serial, b varchar(500));
INSERT INTO t1 (b) VALUES (repeat('a', 500));

# ----------------------------------------------------- #
# --- Test                                          --- #
# ----------------------------------------------------- #
let $v=16;

--disable_query_log
while ($v)
{
  INSERT INTO t1 (b) SELECT b from t1;
  dec $v;
}
--enable_query_log

# ----------------------------------------------------- #
# --- Check                                         --- #
# ----------------------------------------------------- #
SELECT count(*) FROM t1;

# ----------------------------------------------------- #
# --- Final cleanup                                 --- #
# ----------------------------------------------------- #
DROP TABLE t1;


--- 1.304/mysql-test/t/disabled.def	2007-04-19 01:28:38 +02:00
+++ 1.305/mysql-test/t/disabled.def	2007-04-19 18:38:13 +02:00
@@ -77,6 +77,7 @@
 falcon_bug_27697    : Bug#27697 2007-04-07 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_bug_27951    : Bug#27951 2007-04-19 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
 read_many_rows_falcon : Bug#23783 2006-10-30 ML Get pushbuild green