1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
This commit is contained in:
unknown 2003-08-30 19:01:58 +03:00
commit 37474a61dc
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/isam.result
View File

@ -1,13 +1,5 @@
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))

4
sql/sql_union.cc
View File

@ -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)));
} }
} }
} }