diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-30 09:43:42 -0300 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-30 09:43:42 -0300 |
| commit | ab20577be5d34daed7ae772285d069af59d09dee (patch) | |
| tree | 0ca35ebb75e23482899b95281ad39e3f7ee6b904 /sql/sql_prepare.cc | |
| parent | 6978f450a94fdbe13f340a548a6385130b15c5f9 (diff) | |
| parent | 415fea54c5e6073ec5a40b465ba1d6eeb6032dd1 (diff) | |
| download | mariadb-git-ab20577be5d34daed7ae772285d069af59d09dee.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index a9c4f3f090d..e6731a7bc4d 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -882,7 +882,7 @@ static bool insert_params_with_log(Prepared_statement *stmt, uchar *null_array, type (the types are supplied at execute). Check that the supplied type of placeholder can accept a data stream. */ - else if (!is_param_long_data_type(param)) + else if (! is_param_long_data_type(param)) DBUG_RETURN(1); res= param->query_val_str(&str); if (param->convert_str_value(thd)) @@ -928,7 +928,7 @@ static bool insert_params(Prepared_statement *stmt, uchar *null_array, type (the types are supplied at execute). Check that the supplied type of placeholder can accept a data stream. */ - else if (is_param_long_data_type(param)) + else if (! is_param_long_data_type(param)) DBUG_RETURN(1); if (param->convert_str_value(stmt->thd)) DBUG_RETURN(1); /* out of memory */ |