diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-17 19:42:34 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-17 19:42:34 +0200 |
| commit | 07315d36030bd1cbe6acfeb3e8f60c49ba876a10 (patch) | |
| tree | 9c74de4bb97507ece945576df7073a7a28f07674 /sql/sql_error.cc | |
| parent | 4656060f118caba30912cca2557d72fcea307283 (diff) | |
| download | mariadb-git-07315d36030bd1cbe6acfeb3e8f60c49ba876a10.tar.gz | |
strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1)
with a bit of lame protection against abuse.
Diffstat (limited to 'sql/sql_error.cc')
| -rw-r--r-- | sql/sql_error.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc index 06da6250e71..61281af1d0a 100644 --- a/sql/sql_error.cc +++ b/sql/sql_error.cc @@ -367,7 +367,7 @@ Diagnostics_area::set_ok_status(THD *thd, ulonglong affected_rows_arg, m_affected_rows= affected_rows_arg; m_last_insert_id= last_insert_id_arg; if (message_arg) - strmake(m_message, message_arg, sizeof(m_message) - 1); + strmake_buf(m_message, message_arg); else m_message[0]= '\0'; m_status= DA_OK; @@ -435,7 +435,7 @@ Diagnostics_area::set_error_status(THD *thd, uint sql_errno_arg, m_sql_errno= sql_errno_arg; memcpy(m_sqlstate, sqlstate, SQLSTATE_LENGTH); m_sqlstate[SQLSTATE_LENGTH]= '\0'; - strmake(m_message, message_arg, sizeof(m_message)-1); + strmake_buf(m_message, message_arg); m_status= DA_ERROR; DBUG_VOID_RETURN; |