From 674f3881dff0baa13a0b19b7a577bf96a80ce2d3 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 30 Aug 2003 18:21:24 +0300 Subject: [PATCH] Two small fixes mysql-test/r/isam.result: Fixing results to match test changes sql/sql_union.cc: Better fix for VC++ --- mysql-test/r/isam.result | 8 -------- sql/sql_union.cc | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/mysql-test/r/isam.result b/mysql-test/r/isam.result index b83185b0c01..bacb88a27fc 100644 --- a/mysql-test/r/isam.result +++ b/mysql-test/r/isam.result @@ -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)) diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 011c1a5a8b8..55f697e9981 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -326,8 +326,8 @@ int st_select_lex_unit::exec() 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))); } } }