Commit 674f3881 authored by unknown's avatar unknown

Two small fixes


mysql-test/r/isam.result:
  Fixing results to match test changes
sql/sql_union.cc:
  Better fix for VC++
parent fd7bc726
drop table if exists t1,t2; drop table if exists t1,t2;
create table t1 (a tinyint not null auto_increment, b blob not null, primary key (a)) type=isam; 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); delete from t1 where (a & 1);
select sum(length(b)) from t1; select sum(length(b)) from t1;
sum(length(b)) sum(length(b))
......
...@@ -326,8 +326,8 @@ int st_select_lex_unit::exec() ...@@ -326,8 +326,8 @@ int st_select_lex_unit::exec()
We get this from the difference of between total number of possible We get this from the difference of between total number of possible
rows and actual rows added to the temporary table. rows and actual rows added to the temporary table.
*/ */
add_rows+= (ulonglong) (thd->limit_found_rows - (table->file->records - add_rows+= (ha_rows) (thd->limit_found_rows - (ulonglong)
records_at_start)); ((table->file->records - records_at_start)));
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment