1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6

This commit is contained in:
Michael Widenius
2012-08-01 17:27:34 +03:00
parent 5a86a61219
commit 1d0f70c2f8
557 changed files with 124450 additions and 30236 deletions

View File

@ -20,6 +20,8 @@
#include "m_string.h" /* LEX_STRING */
#include "sql_string.h" /* String */
#include "mysql_com.h" /* MYSQL_ERRMSG_SIZE */
#include "my_time.h" /* MYSQL_TIME */
#include "decimal.h"
class THD;
@ -319,6 +321,14 @@ private:
MEM_ROOT *m_mem_root;
};
class Sql_condition : public MYSQL_ERROR
{
/*
Wrapper class to allow one to use Sql_condition in handlers instead of
MYSQL_ERROR
*/
};
///////////////////////////////////////////////////////////////////////////
/**