mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki 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
commit d019af402c
47 changed files with 141 additions and 342 deletions
Download patch file Download diff file Expand all files Collapse all files

3
storage/spider/ha_spider.cc
View file

@ -9559,7 +9559,6 @@ int ha_spider::write_row(
DBUG_RETURN(error_num);
}
#endif
ha_statistic_increment(&SSV::ha_write_count);
#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100000
#else
if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_INSERT)
@ -9795,7 +9794,6 @@ int ha_spider::update_row(
DBUG_RETURN(error_num);
}
#endif
ha_statistic_increment(&SSV::ha_update_count);
#ifdef HANDLER_HAS_DIRECT_UPDATE_ROWS
do_direct_update = FALSE;
#endif
@ -10138,7 +10136,6 @@ int ha_spider::delete_row(
DBUG_RETURN(error_num);
}
#endif
ha_statistic_increment(&SSV::ha_delete_count);
#ifdef HANDLER_HAS_DIRECT_UPDATE_ROWS
do_direct_update = FALSE;
#endif