Below is the list of changes that have just been committed into a local
6.0-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-08-27 12:35:53+02:00, hakank@stripped +4 -0
Refined test cases.
mysql-test/r/falcon_bug_30124.result@stripped, 2007-08-27 12:35:49+02:00, hakank@stripped +8 -208
Lowered loop count to get test case runable on Pushbuild.
mysql-test/r/falcon_bug_30210.result@stripped, 2007-08-27 12:35:49+02:00, hakank@stripped +7 -13
Adjusted test to run on Linux, too.
mysql-test/t/falcon_bug_30124.test@stripped, 2007-08-27 12:35:49+02:00, hakank@stripped +22 -9
Lowered loop count to get test case runable on Pushbuild.
mysql-test/t/falcon_bug_30210.test@stripped, 2007-08-27 12:35:49+02:00, hakank@stripped +23 -10
Adjusted test to run on Linux, too.
# 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_30124.result 2007-08-24 07:28:34 +02:00
+++ 1.2/mysql-test/r/falcon_bug_30124.result 2007-08-27 12:35:49 +02:00
@@ -1,5 +1,5 @@
-SET STORAGE_ENGINE = Falcon;
*** Bug #30124 ***
+SET @@storage_engine = 'Falcon';
DROP TABLE IF EXISTS t1;
DROP PROCEDURE IF EXISTS p1;
SET @@autocommit=0;
@@ -9,10 +9,7 @@
BEGIN
SET @i = 0;
SET @v = 0;
-WHILE @i < 1000000 DO
-IF mod(@i, 10000) = 0 THEN
-SELECT @i;
-END IF;
+WHILE @i < 500000 DO
SET @a = @v;
EXECUTE stmt1 USING @a;
SET @v = @v + 1;
@@ -23,212 +20,15 @@
END WHILE;
END;//
CALL p1;
-@i
-0
-@i
-10000
-@i
-20000
-@i
-30000
-@i
-40000
-@i
-50000
-@i
-60000
-@i
-70000
-@i
-80000
-@i
-90000
-@i
-100000
-@i
-110000
-@i
-120000
-@i
-130000
-@i
-140000
-@i
-150000
-@i
-160000
-@i
-170000
-@i
-180000
-@i
-190000
-@i
-200000
-@i
-210000
-@i
-220000
-@i
-230000
-@i
-240000
-@i
-250000
-@i
-260000
-@i
-270000
-@i
-280000
-@i
-290000
-@i
-300000
-@i
-310000
-@i
-320000
-@i
-330000
-@i
-340000
-@i
-350000
-@i
-360000
-@i
-370000
-@i
-380000
-@i
-390000
-@i
-400000
-@i
-410000
-@i
-420000
-@i
-430000
-@i
-440000
-@i
-450000
-@i
-460000
-@i
-470000
-@i
-480000
-@i
-490000
-@i
-500000
-@i
-510000
-@i
-520000
-@i
-530000
-@i
-540000
-@i
-550000
-@i
-560000
-@i
-570000
-@i
-580000
-@i
-590000
-@i
-600000
-@i
-610000
-@i
-620000
-@i
-630000
-@i
-640000
-@i
-650000
-@i
-660000
-@i
-670000
-@i
-680000
-@i
-690000
-@i
-700000
-@i
-710000
-@i
-720000
-@i
-730000
-@i
-740000
-@i
-750000
-@i
-760000
-@i
-770000
-@i
-780000
-@i
-790000
-@i
-800000
-@i
-810000
-@i
-820000
-@i
-830000
-@i
-840000
-@i
-850000
-@i
-860000
-@i
-870000
-@i
-880000
-@i
-890000
-@i
-900000
-@i
-910000
-@i
-920000
-@i
-930000
-@i
-940000
-@i
-950000
-@i
-960000
-@i
-970000
-@i
-980000
-@i
-990000
COMMIT;
SET @@autocommit = 1;
-SELECT count(*) from t1;
-count(*)
-1000000
UPDATE t1 SET b = 5 WHERE b = 3;
+SELECT count(*) FROM t1;
+count(*)
+500000
+SELECT count(*) FROM t1 WHERE b = 5;
+count(*)
+100000
DEALLOCATE PREPARE stmt1;
DROP TABLE t1;
DROP PROCEDURE p1;
--- 1.1/mysql-test/r/falcon_bug_30210.result 2007-08-27 01:25:50 +02:00
+++ 1.2/mysql-test/r/falcon_bug_30210.result 2007-08-27 12:35:49 +02:00
@@ -1,19 +1,13 @@
-SET storage_engine = Falcon;
*** Bug #28076 ***
+SET @@storage_engine = 'Falcon';
DROP TABLE IF EXISTS T;
DROP TABLE IF EXISTS t;
-CREATE TABLE T (s1 int);
-CREATE TABLE t (s1 int);
-ERROR 42S01: Table 't' already exists
+CREATE TABLE T (a int);
+CREATE TABLE t (a int);
+Got one of the listed errors
INSERT INTO T VALUES (1);
-INSERT INTO t VALUES (2);
-SELECT * FROM T;
-s1
+SELECT count(*) FROM T;
+count(*)
1
-2
-SELECT * FROM t;
-s1
-1
-2
-DROP TABLE IF EXISTS T;
DROP TABLE IF EXISTS t;
+DROP TABLE T;
--- 1.1/mysql-test/t/falcon_bug_30124.test 2007-08-24 07:28:37 +02:00
+++ 1.2/mysql-test/t/falcon_bug_30124.test 2007-08-27 12:35:49 +02:00
@@ -1,4 +1,3 @@
-SET STORAGE_ENGINE = Falcon;
#
# Bug #22150: UPDATE has unacceptable performance
#
@@ -7,9 +6,16 @@
# With the bug, it took 30 to 60 minutes.
# It takes a while to build the file though.
#
-
+# Note: original test case is with loop count of 1 mio.
+# Lowered to 500k due to long run time.
--echo *** Bug #30124 ***
+# ----------------------------------------------------- #
+# --- Initialisation --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
--disable_warnings
DROP TABLE IF EXISTS t1;
DROP PROCEDURE IF EXISTS p1;
@@ -27,11 +33,7 @@
SET @i = 0;
SET @v = 0;
- WHILE @i < 1000000 DO
- IF mod(@i, 10000) = 0 THEN
- SELECT @i;
- END IF;
-
+ WHILE @i < 500000 DO
SET @a = @v;
EXECUTE stmt1 USING @a;
@@ -49,11 +51,22 @@
CALL p1;
COMMIT;
+# ----------------------------------------------------- #
+# --- Test --- #
+# ----------------------------------------------------- #
SET @@autocommit = 1;
-SELECT count(*) from t1;
UPDATE t1 SET b = 5 WHERE b = 3;
-# Clean up.
+# ----------------------------------------------------- #
+# --- Check --- #
+# ----------------------------------------------------- #
+SELECT count(*) FROM t1;
+SELECT count(*) FROM t1 WHERE b = 5;
+
+
+# ----------------------------------------------------- #
+# --- Final cleanup --- #
+# ----------------------------------------------------- #
DEALLOCATE PREPARE stmt1;
DROP TABLE t1;
DROP PROCEDURE p1;
--- 1.1/mysql-test/t/falcon_bug_30210.test 2007-08-27 01:25:53 +02:00
+++ 1.2/mysql-test/t/falcon_bug_30210.test 2007-08-27 12:35:49 +02:00
@@ -1,4 +1,3 @@
-SET storage_engine = Falcon;
#
# Bug #30210: Falcon: bad data with case insensitive table names
#
@@ -9,22 +8,36 @@
# Somewhat related to Bug#2166 - Falcon: case insensitive table names
#
--echo *** Bug #28076 ***
+
+# ----------------------------------------------------- #
+# --- Initialisation --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
--disable_warnings
DROP TABLE IF EXISTS T;
DROP TABLE IF EXISTS t;
--enable_warnings
-CREATE TABLE T (s1 int);
---error 1050
-CREATE TABLE t (s1 int);
+CREATE TABLE T (a int);
+
+# ----------------------------------------------------- #
+# --- Test --- #
+# ----------------------------------------------------- #
+--error 1050, 1005
+CREATE TABLE t (a int);
INSERT INTO T VALUES (1);
-INSERT INTO t VALUES (2);
-SELECT * FROM T;
-SELECT * FROM t;
-# Final cleanup.
+# ----------------------------------------------------- #
+# --- Check --- #
+# ----------------------------------------------------- #
+SELECT count(*) FROM T;
+
+# ----------------------------------------------------- #
+# --- Final cleanup --- #
+# ----------------------------------------------------- #
--disable_warnings
-DROP TABLE IF EXISTS T;
DROP TABLE IF EXISTS t;
--enable_warnings
-
+DROP TABLE T;
| Thread |
|---|
| • bk commit into 6.0-falcon tree (hakank:1.2718) | Hakan Kuecuekyilmaz | 27 Aug |
