summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavi Arnaut <davi.arnaut@oracle.com>2010-07-30 09:34:40 -0300
committerDavi Arnaut <davi.arnaut@oracle.com>2010-07-30 09:34:40 -0300
commita6f726c5855011f6ba660ced6bce4721507d0fa3 (patch)
tree6b9ddc443cbff3c4cee46244d7629976c335bc0e
parentd3d32008b8e06e532459de2563c75ec5e67d1cc9 (diff)
downloadmariadb-git-a6f726c5855011f6ba660ced6bce4721507d0fa3.tar.gz
Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite run
Fix a regression (due to a typo) which caused spurious incorrect argument errors for long data stream parameters if all forms of logging were disabled (binary, general and slow logs). sql/sql_prepare.cc: Add a missing logical NOT operator.
-rw-r--r--sql/sql_prepare.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index c2fecd63777..9815acfe815 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -755,7 +755,7 @@ static bool insert_params_withlog(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))
@@ -801,7 +801,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 */