database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Fixed prototype of get_error_message to use String to return error message

Browse Source 
WL#1747 and #1746 allow user to decide if ordered index should be created or not
This commit is contained in:
magnus@neptunus.(none)
2004-05-24 12:35:39 +02:00
parent 1f1b01e028
commit 15023e1b8f
5 changed files with 124 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sql/handler.cc
View File

@@ -1123,14 +1123,15 @@ void handler::print_error(int error, myf errflag)
/* The error was "unknown" to this function.
Ask handler if it has got a message for this error */
bool temporary= FALSE;
const char* msg= get_error_message(&error, &temporary);
if (msg)
String str;
temporary= get_error_message(error, &str);
if (!str.is_empty())
{
const char* engine= ha_get_storage_engine(table->db_type);
if (temporary)
my_error(ER_GET_TEMPORARY_ERRMSG,MYF(0),error,msg,engine);
my_error(ER_GET_TEMPORARY_ERRMSG,MYF(0),error,str.ptr(),engine);
else
my_error(ER_GET_ERRMSG,MYF(0),error,msg,engine);
my_error(ER_GET_ERRMSG,MYF(0),error,str.ptr(),engine);
}
else
my_error(ER_GET_ERRNO,errflag,error);
@@ -1146,15 +1147,15 @@ void handler::print_error(int error, myf errflag)
Return an error message specific to this handler
SYNOPSIS
error [in/out] error code previously returned by handler
temporary [out] temporary error, transaction should be retried if true
error error code previously returned by handler
buf Pointer to String where to add error message
The returned pointer to error message should not be freed.
Returns true if this is a temporary error
*/
const char* handler::get_error_message(int *error, bool *temporary)
bool handler::get_error_message(int error, String* buf)
{
return NULL;
return false;
}