bzr commit into mysql-6.0-falcon-team branch (hky:2937)

[Hakan Kuecuekyilmaz]

#At file:///home/hakan/work/mysql/mysql-6.0-falcon-team-to-merge/ based on
revid:hky@stripped

 2937 Hakan Kuecuekyilmaz	2008-12-16
      Lowered loop count and adjusted warnings.
modified:
  mysql-test/suite/falcon_team/r/falcon_bug_26433.result
  mysql-test/suite/falcon_team/t/falcon_bug_26433.test

=== modified file 'mysql-test/suite/falcon_team/r/falcon_bug_26433.result'
--- a/mysql-test/suite/falcon_team/r/falcon_bug_26433.result	2008-04-24 04:09:39 +0000
+++ b/mysql-test/suite/falcon_team/r/falcon_bug_26433.result	2008-12-16 18:09:41 +0000
@@ -1,5 +1,5 @@
-SET @@storage_engine = Falcon;
 *** Bug #26433 ***
+SET @@storage_engine = 'Falcon';
 DROP TABLE IF EXISTS t1;
 DROP PROCEDURE IF EXISTS p1;
 SET @a = 909;
@@ -7,9 +7,9 @@ CREATE PROCEDURE p1 ()
 BEGIN
 DECLARE v int default 0;
 DECLARE v500 int;
-DECLARE v499  int;
-DECLARE v255  int;
-DECLARE v99   int;
+DECLARE v499 int;
+DECLARE v255 int;
+DECLARE v99  int;
 DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
 BEGIN
 DECLARE vx int;
@@ -46,13 +46,13 @@ END WHILE;
 SELECT 'c';
 CREATE INDEX i1 ON t1 (b, a);
 CREATE INDEX i2 ON t1 (c, a);
-select 'd';
+SELECT 'd';
 SET v = 0;
-while v < 500 do
+WHILE v < 250 DO
 SET v500 = rand(@a) * 500;
-SET v499  = rand(@a) * 499;
-SET v255  = rand(@a) * 255;
-SET v99   = rand(@a) * 99;
+SET v499 = rand(@a) * 499;
+SET v255 = rand(@a) * 255;
+SET v99  = rand(@a) *  99;
 SET @x = concat('update t1 set b = repeat(0x', hex(v500),',',v499,'), a =', v,', c =
repeat(0x', hex(v255), ',',v99,')');
 /* SELECT v, @x; */
 PREPARE stmt1 FROM @x;
@@ -77,7 +77,6 @@ c
 d
 d
 Warnings:
-Warning	1265	Data truncated for column 'b' at row 20
 Warning	1265	Data truncated for column 'b' at row 21
 Warning	1265	Data truncated for column 'b' at row 22
 Warning	1265	Data truncated for column 'b' at row 23
@@ -97,6 +96,7 @@ Warning	1265	Data truncated for column '
 Warning	1265	Data truncated for column 'b' at row 37
 Warning	1265	Data truncated for column 'b' at row 38
 Warning	1265	Data truncated for column 'b' at row 39
+Warning	1265	Data truncated for column 'b' at row 40
 Warning	1366	Incorrect string value: '\x92\x92\x92\x92\x92\x92...' for column 'c' at row
1
 Warning	1366	Incorrect string value: '\x92\x92\x92\x92\x92\x92...' for column 'c' at row
2
 Warning	1366	Incorrect string value: '\x92\x92\x92\x92\x92\x92...' for column 'c' at row
3
@@ -117,7 +117,6 @@ Warning	1366	Incorrect string value: '\x
 Warning	1366	Incorrect string value: '\x92\x92\x92\x92\x92\x92...' for column 'c' at row
18
 Warning	1366	Incorrect string value: '\x92\x92\x92\x92\x92\x92...' for column 'c' at row
19
 Warning	1366	Incorrect string value: '\x92\x92\x92\x92\x92\x92...' for column 'c' at row
20
-Warning	1265	Data truncated for column 'b' at row 20
 Warning	1265	Data truncated for column 'b' at row 21
 Warning	1265	Data truncated for column 'b' at row 22
 Warning	1265	Data truncated for column 'b' at row 23
@@ -137,6 +136,7 @@ Warning	1265	Data truncated for column '
 Warning	1265	Data truncated for column 'b' at row 37
 Warning	1265	Data truncated for column 'b' at row 38
 Warning	1265	Data truncated for column 'b' at row 39
+Warning	1265	Data truncated for column 'b' at row 40
 Warning	1366	Incorrect string value: '\x92\x92\x92\x92\x92\x92...' for column 'c' at row
1
 Warning	1366	Incorrect string value: '\x92\x92\x92\x92\x92\x92...' for column 'c' at row
2
 Warning	1366	Incorrect string value: '\x92\x92\x92\x92\x92\x92...' for column 'c' at row
3

=== modified file 'mysql-test/suite/falcon_team/t/falcon_bug_26433.test'
--- a/mysql-test/suite/falcon_team/t/falcon_bug_26433.test	2008-04-24 04:09:39 +0000
+++ b/mysql-test/suite/falcon_team/t/falcon_bug_26433.test	2008-12-16 18:09:41 +0000
@@ -1,9 +1,19 @@
 --source include/have_falcon.inc
-SET @@storage_engine = Falcon;
+
 #
 # Bug #26433: Falcon: crash in procedure after error 1025
 #
+#   Note: Lowered loop count to 250 due to too long run time.
+#         See corresponding -big test for long running version.
+#
 --echo *** Bug #26433 ***
+
+# ----------------------------------------------------- #
+# --- Initialisation                                --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 DROP PROCEDURE IF EXISTS p1;
@@ -18,9 +28,9 @@ CREATE PROCEDURE p1 ()
 BEGIN
   DECLARE v int default 0;
   DECLARE v500 int;
-  DECLARE v499  int;
-  DECLARE v255  int;
-  DECLARE v99   int;
+  DECLARE v499 int;
+  DECLARE v255 int;
+  DECLARE v99  int;
   DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
   BEGIN
     DECLARE vx int;
@@ -57,13 +67,13 @@ BEGIN
   SELECT 'c';
   CREATE INDEX i1 ON t1 (b, a);
   CREATE INDEX i2 ON t1 (c, a);
-  select 'd';
+  SELECT 'd';
   SET v = 0;
-  while v < 500 do
+  WHILE v < 250 DO
     SET v500 = rand(@a) * 500;
-    SET v499  = rand(@a) * 499;
-    SET v255  = rand(@a) * 255;
-    SET v99   = rand(@a) * 99;
+    SET v499 = rand(@a) * 499;
+    SET v255 = rand(@a) * 255;
+    SET v99  = rand(@a) *  99;
     SET @x = concat('update t1 set b = repeat(0x', hex(v500),',',v499,'), a =', v,', c =
repeat(0x', hex(v255), ',',v99,')');
     /* SELECT v, @x; */
     PREPARE stmt1 FROM @x;
@@ -79,9 +89,20 @@ BEGIN
   END WHILE;
 END//
 
+# ----------------------------------------------------- #
+# --- Test                                          --- #
+# ----------------------------------------------------- #
 CALL p1()//
 
-# Final cleanup.
+# ----------------------------------------------------- #
+# --- Check                                         --- #
+# ----------------------------------------------------- #
+# Final sanity check not applicable here.
+#SELECT count(*) FROM t1;
+
+# ----------------------------------------------------- #
+# --- Final cleanup                                 --- #
+# ----------------------------------------------------- #
 DELIMITER ;//
 DROP TABLE t1;
 DROP PROCEDURE p1;