diff options
| author | Chad MILLER <chad@mysql.com> | 2009-04-14 13:20:13 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2009-04-14 13:20:13 -0400 |
| commit | 14f923c0286588f9f391a2fda8b9fab5a4e2953c (patch) | |
| tree | 55596b47965261462217616f8271d0c2b9d79ab0 /sql/sql_prepare.cc | |
| parent | 9d7f61dc698ee6b1dd379cc5820c59b8a9806c2d (diff) | |
| parent | bd2db28cdad7e715b9efcee2f440f432a0562e8f (diff) | |
| download | mariadb-git-14f923c0286588f9f391a2fda8b9fab5a4e2953c.tar.gz | |
Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 505a3d122b4..c152bde1b92 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -726,13 +726,13 @@ static bool insert_params_withlog(Prepared_statement *stmt, uchar *null_array, Item_param *param= *it; if (param->state != Item_param::LONG_DATA_VALUE) { - if (is_param_null(null_array, it - begin)) + if (is_param_null(null_array, (uint) (it - begin))) param->set_null(); else { if (read_pos >= data_end) DBUG_RETURN(1); - param->set_param_func(param, &read_pos, data_end - read_pos); + param->set_param_func(param, &read_pos, (uint) (data_end - read_pos)); if (param->state == Item_param::NO_VALUE) DBUG_RETURN(1); } @@ -764,13 +764,13 @@ static bool insert_params(Prepared_statement *stmt, uchar *null_array, Item_param *param= *it; if (param->state != Item_param::LONG_DATA_VALUE) { - if (is_param_null(null_array, it - begin)) + if (is_param_null(null_array, (uint) (it - begin))) param->set_null(); else { if (read_pos >= data_end) DBUG_RETURN(1); - param->set_param_func(param, &read_pos, data_end - read_pos); + param->set_param_func(param, &read_pos, (uint) (data_end - read_pos)); if (param->state == Item_param::NO_VALUE) DBUG_RETURN(1); } |