database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

misc after-merge changes:

Browse Source 
* remove new InnoDB-specific ER_ and HA_ERR_ codes
* renamed few old ER_ and HA_ERR_ error messages to be less MyISAM-specific
* remove duplicate enum definitions (durability_properties, icp_result)
* move new mysql-test include files to their owner suite
* rename xtradb.rdiff files to *-disabled
* remove mistakenly committed helper perl module
* remove long obsolete handler::ha_statistic_increment() method
* restore the standard C xid_t structure to not have setters and getters
* remove xid_t::reset that was cleaning too much
* move MySQL-5.7 ER_ codes where they belong
* fir innodb to include service_wsrep.h not internal wsrep headers
* update tests and results
This commit is contained in:
Sergei Golubchik
2016-09-10 16:04:44 +02:00
parent d8cbad069a
commit d019af402c
47 changed files with 141 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
sql/handler.h
View File

@ -574,31 +574,6 @@ struct xid_t {
char data[XIDDATASIZE]; // not \0-terminated !
xid_t() {} /* Remove gcc warning */
long get_format_id() const
{ return formatID; }
void set_format_id(long v)
{
formatID= v;
}
long get_gtrid_length() const
{ return gtrid_length; }
void set_gtrid_length(long v)
{
gtrid_length= v;
}
long get_bqual_length() const
{ return bqual_length; }
void set_bqual_length(long v)
{
bqual_length= v;
}
const char* get_data() const
{ return data; }
void set_data(const void* v, long l)
{
DBUG_ASSERT(l <= XIDDATASIZE);
memcpy(data, v, l);
}
bool eq(struct xid_t *xid)
{ return !xid->is_null() && eq(xid->gtrid_length, xid->bqual_length, xid->data); }
bool eq(long g, long b, const char *d)
@ -611,13 +586,6 @@ struct xid_t {
memcpy(data, g, gtrid_length= gl);
memcpy(data+gl, b, bqual_length= bl);
}
void reset()
{
formatID= -1;
gtrid_length= 0;
bqual_length= 0;
memset(data, 0, XIDDATASIZE);
}
void set(ulonglong xid)
{
my_xid tmp;
@ -3916,9 +3884,6 @@ public:
TABLE* get_table() { return table; }
TABLE_SHARE* get_table_share() { return table_share; }
protected:
/* deprecated, don't use in new engines */
// inline void ha_statistic_increment(ulong SSV::*offset) const { }
#define ha_statistic_increment(A)
/* Service methods for use by storage engines. */
void **ha_data(THD *) const;
THD *ha_thd(void) const;