diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-10 16:04:44 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-10 16:04:44 +0200 |
| commit | d019af402cdaa80bd03ad8a5cf2c11cf54443248 (patch) | |
| tree | bcbe5acdb8804a3087639b6d9de70c3d1149cb65 /storage/perfschema | |
| parent | d8cbad069acd171c0b9d417fbda74aaf1f3c96a1 (diff) | |
| download | mariadb-git-d019af402cdaa80bd03ad8a5cf2c11cf54443248.tar.gz | |
misc after-merge changes:
* 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
Diffstat (limited to 'storage/perfschema')
| -rw-r--r-- | storage/perfschema/ha_perfschema.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/storage/perfschema/ha_perfschema.cc b/storage/perfschema/ha_perfschema.cc index 2a87ffba999..87ce386a7cd 100644 --- a/storage/perfschema/ha_perfschema.cc +++ b/storage/perfschema/ha_perfschema.cc @@ -271,7 +271,6 @@ int ha_perfschema::write_row(uchar *buf) DBUG_RETURN(HA_ERR_WRONG_COMMAND); DBUG_ASSERT(m_table_share); - ha_statistic_increment(&SSV::ha_write_count); result= m_table_share->write_row(table, buf, table->field); DBUG_RETURN(result); } @@ -297,7 +296,6 @@ int ha_perfschema::update_row(const uchar *old_data, uchar *new_data) DBUG_RETURN(0); DBUG_ASSERT(m_table); - ha_statistic_increment(&SSV::ha_update_count); int result= m_table->update_row(table, old_data, new_data, table->field); DBUG_RETURN(result); } @@ -309,7 +307,6 @@ int ha_perfschema::delete_row(const uchar *buf) DBUG_RETURN(HA_ERR_WRONG_COMMAND); DBUG_ASSERT(m_table); - ha_statistic_increment(&SSV::ha_delete_count); int result= m_table->delete_row(table, buf, table->field); DBUG_RETURN(result); } @@ -354,7 +351,6 @@ int ha_perfschema::rnd_next(uchar *buf) } DBUG_ASSERT(m_table); - ha_statistic_increment(&SSV::ha_read_rnd_next_count); int result= m_table->rnd_next(); if (result == 0) @@ -386,7 +382,6 @@ int ha_perfschema::rnd_pos(uchar *buf, uchar *pos) } DBUG_ASSERT(m_table); - ha_statistic_increment(&SSV::ha_read_rnd_count); int result= m_table->rnd_pos(pos); if (result == 0) result= m_table->read_row(table, buf, table->field); |