summaryrefslogtreecommitdiff
path: root/sql/field_conv.cc
diff options
context:
space:
mode:
authorbell@sanja.is.com.ua <>2004-11-13 19:35:51 +0200
committerbell@sanja.is.com.ua <>2004-11-13 19:35:51 +0200
commit7210195f1e8b482db0a102b921a859604a1f9522 (patch)
treea534689811d0f65eba423eed77b056f3bb30bd51 /sql/field_conv.cc
parent1555469b646733f86692033bb20f500b7be29458 (diff)
downloadmariadb-git-7210195f1e8b482db0a102b921a859604a1f9522.tar.gz
now my_printf_error is not better then my_error, but my_error call is shorter
used only one implementation of format parser of (printf) fixed multistatement
Diffstat (limited to 'sql/field_conv.cc')
-rw-r--r--sql/field_conv.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc
index 61a5a28f47b..336408c5aa9 100644
--- a/sql/field_conv.cc
+++ b/sql/field_conv.cc
@@ -126,8 +126,7 @@ set_field_to_null(Field *field)
return 0;
}
if (!current_thd->no_errors)
- my_printf_error(ER_BAD_NULL_ERROR,ER(ER_BAD_NULL_ERROR),MYF(0),
- field->field_name);
+ my_error(ER_BAD_NULL_ERROR, MYF(0), field->field_name);
return -1;
}
@@ -185,8 +184,7 @@ set_field_to_null_with_conversions(Field *field, bool no_conversions)
return 0;
}
if (!current_thd->no_errors)
- my_printf_error(ER_BAD_NULL_ERROR,ER(ER_BAD_NULL_ERROR),MYF(0),
- field->field_name);
+ my_error(ER_BAD_NULL_ERROR, MYF(0), field->field_name);
return -1;
}