5.5 merge

This commit is contained in:
Sergei Golubchik 2013-06-06 17:51:28 +02:00
commit 4749d40c63
464 changed files with 7733 additions and 3067 deletions

View file

@ -191,6 +191,17 @@ public:
MYSQL_ERROR::enum_warning_level get_level() const
{ return m_level; }
/** check if condition was handled by a condition handler */
bool handled() const
{
return m_handled;
}
/** mark that condition was handled */
void mark_handled()
{
m_handled= 1;
}
private:
/*
The interface of MYSQL_ERROR is mostly private, by design,
@ -306,6 +317,9 @@ private:
/** MySQL extension, MYSQL_ERRNO condition item. */
uint m_sql_errno;
/** Marker if error/warning was handled by a continue handler */
bool m_handled;
/**
SQL RETURNED_SQLSTATE condition item.
This member is always NUL terminated.