summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-06-18 01:55:42 +0200
committerunknown <jimw@mysql.com>2005-06-18 01:55:42 +0200
commit94d1d88658e5aa75d999c308ac464014f20a3d02 (patch)
tree076bb703eac95ae156980bf3eda38b417ad59e5e /sql/sql_union.cc
parent0945dea8d08b13189691052b79fe2bd255e0f008 (diff)
downloadmariadb-git-94d1d88658e5aa75d999c308ac464014f20a3d02.tar.gz
Clean up warnings and build problems on Windows. (Bug #11045)
VC++Files/sql/mysqld.dsp: Link debug server against debug yassl sql/examples/ha_archive.cc: Fix type for variables used to store number of rows Add cast when reading current position sql/examples/ha_archive.h: Fix variables used to store rows to ha_rows sql/ha_federated.cc: Remove unused variables, fix type of variable used to store query id sql/item_strfunc.cc: Remove unused variables sql/sql_acl.cc: Remove unused variables sql/sql_lex.cc: Add casts to fix type used for counting number of rows sql/sql_lex.h: Fix size of options to be ulong again sql/sql_insert.cc: Fix type of query id value sql/sql_union.cc: Cast value for number of rows to ha_rows sql/sql_yacc.yy: Remove unused variable sql/table.cc: Add casts for handling key_part lengths
Diffstat (limited to 'sql/sql_union.cc')
-rw-r--r--sql/sql_union.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index f59d7fffe85..3d3acf40f37 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -448,7 +448,9 @@ bool st_select_lex_unit::exec()
table->no_keyread=1;
}
res= sl->join->error;
- offset_limit_cnt= sl->offset_limit ? sl->offset_limit->val_uint() : 0;
+ offset_limit_cnt= (ha_rows)(sl->offset_limit ?
+ sl->offset_limit->val_uint() :
+ 0);
if (!res)
{
examined_rows+= thd->examined_row_count;