bk commit into 4.1 tree (1.1597)

[sinisa]

Below is the list of changes that have just been committed into a local
4.1 repository of Sinisa. When Sinisa 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1597 03/08/30 18:21:24 Sinisa@stripped +2 -0
  Two small fixes

  sql/sql_union.cc
    1.95 03/08/30 18:21:17 Sinisa@stripped +2 -2
    Better fix for VC++

  mysql-test/r/isam.result
    1.17 03/08/30 18:21:17 Sinisa@stripped +0 -8
    Fixing results to match test changes

# 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:	Sinisa
# Host:	sinisa.nasamreza.org
# Root:	/mnt/work/mysql-4.1

--- 1.94/sql/sql_union.cc	Sat Aug 30 17:13:03 2003
+++ 1.95/sql/sql_union.cc	Sat Aug 30 18:21:17 2003
@@ -326,8 +326,8 @@
 	  We get this from the difference of between total number of possible
 	  rows and actual rows added to the temporary table.
 	*/
-	add_rows+= (ulonglong) (thd->limit_found_rows - (table->file->records -
-							 records_at_start));
+	add_rows+= (ha_rows) (thd->limit_found_rows - (ulonglong)
+			      ((table->file->records -  records_at_start)));
       }
     }
   }

--- 1.16/mysql-test/r/isam.result	Sun Jul 20 14:59:53 2003
+++ 1.17/mysql-test/r/isam.result	Sat Aug 30 18:21:17 2003
@@ -1,13 +1,5 @@
 drop table if exists t1,t2;
 create table t1 (a tinyint not null auto_increment, b blob not null, primary key (a)) type=isam;
-Warnings:
-Warning	1263	Data truncated for column 'b' at row 1
-Warnings:
-Warning	1263	Data truncated for column 'b' at row 1
-Warnings:
-Warning	1263	Data truncated for column 'b' at row 1
-Warnings:
-Warning	1263	Data truncated for column 'b' at row 1
 delete from t1 where (a & 1);
 select sum(length(b)) from t1;
 sum(length(b))