diff options
| author | jimw@mysql.com <> | 2005-06-18 01:55:42 +0200 |
|---|---|---|
| committer | jimw@mysql.com <> | 2005-06-18 01:55:42 +0200 |
| commit | f2b0874f80a8d7f1c93f274c321514b2f02f7a09 (patch) | |
| tree | 076bb703eac95ae156980bf3eda38b417ad59e5e /sql/sql_union.cc | |
| parent | 07892fe2196aa02baced6ac8ed3b8ce269bbc67b (diff) | |
| download | mariadb-git-f2b0874f80a8d7f1c93f274c321514b2f02f7a09.tar.gz | |
Clean up warnings and build problems on Windows. (Bug #11045)
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 4 |
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; |