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

Merging from mysql-5.1 to mysql-5.5.

Browse Source
This commit is contained in:
Annamalai Gurusami
2011-12-13 17:10:09 +05:30
parent 091a2e3b0b ad84fb5c37
commit 76383243b2
3 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/suite/innodb/r/innodb.result
View File

@ -3191,3 +3191,14 @@ Handler_update 1
Variable_name Value Variable_name Value
Handler_delete 1 Handler_delete 1
DROP TABLE bug58912; DROP TABLE bug58912;
create table t1 (f1 integer primary key) engine=innodb;
flush status;
show status like "handler_read_key";
Variable_name Value
Handler_read_key 0
select f1 from t1;
f1
show status like "handler_read_key";
Variable_name Value
Handler_read_key 1
drop table t1;

11
mysql-test/suite/innodb/t/innodb.test
View File

@ -2578,6 +2578,17 @@ SET GLOBAL innodb_thread_concurrency = @innodb_thread_concurrency_orig;
# Clean up after the Bug#55284/Bug#58912 test case. # Clean up after the Bug#55284/Bug#58912 test case.
DROP TABLE bug58912; DROP TABLE bug58912;
#
# Test fix for bug 13117023. InnoDB increments HA_READ_KEY_COUNT (aka
# HANDLER_READ_KEY) when it should not.
#
create table t1 (f1 integer primary key) engine=innodb;
flush status;
show status like "handler_read_key";
select f1 from t1;
show status like "handler_read_key";
drop table t1;
####################################################################### #######################################################################
# # # #
# Please, DO NOT TOUCH this file as well as the innodb.result file. # # Please, DO NOT TOUCH this file as well as the innodb.result file. #

1
storage/innobase/handler/ha_innodb.cc
View File

@ -5792,7 +5792,6 @@ ha_innobase::innobase_get_index(
dict_index_t* index = 0; dict_index_t* index = 0;
DBUG_ENTER("innobase_get_index"); DBUG_ENTER("innobase_get_index");
ha_statistic_increment(&SSV::ha_read_key_count);
if (keynr != MAX_KEY && table->s->keys > 0) { if (keynr != MAX_KEY && table->s->keys > 0) {
key = table->key_info + keynr; key = table->key_info + keynr;