1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'merge/merge-xtradb-5.6' into 10.0

Browse Source
This commit is contained in:
Sergei Golubchik 2016-12-04 01:37:55 +01:00
commit f35b0d8ef8
2 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
storage/xtradb/handler/ha_innodb.cc
View File

@ -8213,12 +8213,6 @@ no_commit:
error = row_insert_for_mysql((byte*) record, prebuilt); error = row_insert_for_mysql((byte*) record, prebuilt);
DEBUG_SYNC(user_thd, "ib_after_row_insert"); DEBUG_SYNC(user_thd, "ib_after_row_insert");
#ifdef EXTENDED_FOR_USERSTAT
if (UNIV_LIKELY(error == DB_SUCCESS && !trx->fake_changes)) {
rows_changed++;
}
#endif
/* Handle duplicate key errors */ /* Handle duplicate key errors */
if (auto_inc_used) { if (auto_inc_used) {
ulonglong auto_inc; ulonglong auto_inc;
@ -8752,12 +8746,6 @@ ha_innobase::update_row(
} }
} }
#ifdef EXTENDED_FOR_USERSTAT
if (UNIV_LIKELY(error == DB_SUCCESS && !trx->fake_changes)) {
rows_changed++;
}
#endif
innobase_srv_conc_exit_innodb(trx); innobase_srv_conc_exit_innodb(trx);
func_exit: func_exit:
@ -8836,12 +8824,6 @@ ha_innobase::delete_row(
error = row_update_for_mysql((byte*) record, prebuilt); error = row_update_for_mysql((byte*) record, prebuilt);
#ifdef EXTENDED_FOR_USERSTAT
if (UNIV_LIKELY(error == DB_SUCCESS && !trx->fake_changes)) {
rows_changed++;
}
#endif
innobase_srv_conc_exit_innodb(trx); innobase_srv_conc_exit_innodb(trx);
/* Tell the InnoDB server that there might be work for /* Tell the InnoDB server that there might be work for
@ -9197,11 +9179,6 @@ ha_innobase::index_read(
srv_stats.n_rows_read.add( srv_stats.n_rows_read.add(
(size_t) prebuilt->trx->id, 1); (size_t) prebuilt->trx->id, 1);
} }
#ifdef EXTENDED_FOR_USERSTAT
rows_read++;
if (active_index < MAX_KEY)
index_rows_read[active_index]++;
#endif
break; break;
case DB_RECORD_NOT_FOUND: case DB_RECORD_NOT_FOUND:
error = HA_ERR_KEY_NOT_FOUND; error = HA_ERR_KEY_NOT_FOUND;
@ -9498,11 +9475,6 @@ ha_innobase::general_fetch(
error = 0; error = 0;
table->status = 0; table->status = 0;
srv_stats.n_rows_read.add((size_t) prebuilt->trx->id, 1); srv_stats.n_rows_read.add((size_t) prebuilt->trx->id, 1);
#ifdef EXTENDED_FOR_USERSTAT
rows_read++;
if (active_index < MAX_KEY)
index_rows_read[active_index]++;
#endif
break; break;
case DB_RECORD_NOT_FOUND: case DB_RECORD_NOT_FOUND:
error = HA_ERR_END_OF_FILE; error = HA_ERR_END_OF_FILE;

4
storage/xtradb/include/univ.i
View File

@ -44,10 +44,10 @@ Created 1/20/1994 Heikki Tuuri
#define INNODB_VERSION_MAJOR 5 #define INNODB_VERSION_MAJOR 5
#define INNODB_VERSION_MINOR 6 #define INNODB_VERSION_MINOR 6
#define INNODB_VERSION_BUGFIX 32 #define INNODB_VERSION_BUGFIX 34
#ifndef PERCONA_INNODB_VERSION #ifndef PERCONA_INNODB_VERSION
#define PERCONA_INNODB_VERSION 79.0 #define PERCONA_INNODB_VERSION 79.1
#endif #endif
/* Enable UNIV_LOG_ARCHIVE in XtraDB */ /* Enable UNIV_LOG_ARCHIVE in XtraDB */