diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-10-01 18:27:32 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-10-01 18:27:32 +0300 |
| commit | ca672e6b61d8e8f4d1c092a1f8a9c0e4f3f19027 (patch) | |
| tree | b8c1cf4e76aa783227756dab2c18d611424e5878 /sql/sql_prepare.cc | |
| parent | f715c9c205a99c1d97cb0f9630fc52e1a916a78d (diff) | |
| parent | 255187b2793e313cb50c1e0f1fe22272b76d3ec3 (diff) | |
| download | mariadb-git-ca672e6b61d8e8f4d1c092a1f8a9c0e4f3f19027.tar.gz | |
Automatic merge
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index d5e53651e18..bf1632d1d53 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2188,7 +2188,7 @@ static const char *get_dynamic_sql_string(LEX *lex, uint *query_len) lex->prepared_stmt_code.length)) && entry->value) { - my_bool is_var_null; + bool is_var_null; var_value= entry->val_str(&is_var_null, &str, NOT_FIXED_DEC); /* NULL value of variable checked early as entry->value so here |