bk commit into 6.0-falcon tree (hakank:1.2581)

[Hakan Kuecuekyilmaz]

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-06-20 06:30:12+02:00, hakank@stripped +3 -0
  Extended test case. Removed no more failing test cases.

  mysql-test/r/falcon_bug_29201.result@stripped, 2007-06-20 06:30:09+02:00, hakank@stripped +17 -4
    Extended test case with decimal(65, 30) field.

  mysql-test/t/disabled.def@stripped, 2007-06-20 06:30:09+02:00, hakank@stripped +0 -2
    Removed no more failing test cases.

  mysql-test/t/falcon_bug_29201.test@stripped, 2007-06-20 06:30:09+02:00, hakank@stripped +10 -3
    Extended test case with decimal(65, 30) field.

# 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_29201.result	2007-06-19 10:54:26 +02:00
+++ 1.2/mysql-test/r/falcon_bug_29201.result	2007-06-20 06:30:09 +02:00
@@ -1,16 +1,29 @@
 *** Bug #29201 ***
 SET @@storage_engine = 'Falcon';
 DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 (a decimal(20, 20));
-INSERT INTO t1 VALUES (0.123456789012345678901234567890);
+CREATE TABLE t1 (
+a decimal(20, 20),
+b decimal(65, 30)
+);
+INSERT INTO t1 (a) VALUES (0.123456789012345678901234567890);
 Warnings:
 Note	1265	Data truncated for column 'a' at row 1
-INSERT INTO t1 VALUES (0.123456789);
+INSERT INTO t1 (a) VALUES (0.123456789);
+INSERT INTO t1 (b) VALUES (0.123456789012345678901234567890);
+INSERT INTO t1 (b) VALUES (0.123456789);
 SELECT a FROM t1 ORDER BY a;
 a
+NULL
+NULL
 0.12345678900000000000
 0.12345678901234567890
+SELECT b FROM t1 ORDER BY b;
+b
+NULL
+NULL
+0.123456789000000000000000000000
+0.123456789012345678901234567890
 SELECT count(*) FROM t1;
 count(*)
-2
+4
 DROP TABLE t1;

--- 1.1/mysql-test/t/falcon_bug_29201.test	2007-06-19 10:54:26 +02:00
+++ 1.2/mysql-test/t/falcon_bug_29201.test	2007-06-20 06:30:09 +02:00
@@ -13,14 +13,21 @@
 DROP TABLE IF EXISTS t1;
 --enable_warnings
 
-CREATE TABLE t1 (a decimal(20, 20));
-INSERT INTO t1 VALUES (0.123456789012345678901234567890);
-INSERT INTO t1 VALUES (0.123456789);
+CREATE TABLE t1 (
+  a decimal(20, 20),
+  b decimal(65, 30)
+);
+INSERT INTO t1 (a) VALUES (0.123456789012345678901234567890);
+INSERT INTO t1 (a) VALUES (0.123456789);
+
+INSERT INTO t1 (b) VALUES (0.123456789012345678901234567890);
+INSERT INTO t1 (b) VALUES (0.123456789);
 
 # ----------------------------------------------------- #
 # --- Test                                          --- #
 # ----------------------------------------------------- #
 SELECT a FROM t1 ORDER BY a;
+SELECT b FROM t1 ORDER BY b;
 
 # ----------------------------------------------------- #
 # --- Check                                         --- #

--- 1.332/mysql-test/t/disabled.def	2007-06-19 10:54:26 +02:00
+++ 1.333/mysql-test/t/disabled.def	2007-06-20 06:30:09 +02:00
@@ -74,8 +74,6 @@
 falcon_bug_28026    : Bug#28026 2007-04-25 hakank Currently failing
 falcon_bug_28158    : Bug#28158 2007-05-02 hakank Currently failing
 falcon_bug_28165    : Bug#28158 2007-05-02 hakank Currently failing because of Bug#28158
-falcon_bug_28725    : Bug#28725 2007-05-28 hakank Currently failing
-falcon_bug_29201    : Bug#29201 2007-06-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