diff options
| author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2012-04-04 14:19:00 +0400 |
|---|---|---|
| committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2012-04-04 14:19:00 +0400 |
| commit | ea1b0492a081f335809e1cae6b9fd7738e00ea02 (patch) | |
| tree | 2756d3da962978b761031031abb721a5e508a2e3 /storage | |
| parent | 46d848b8e1f3e800f2cd0adbc410e4a9cb9f88ca (diff) | |
| parent | b5c690aa548ce7796d25f9df3f8ae056dcda1703 (diff) | |
| download | mariadb-git-ea1b0492a081f335809e1cae6b9fd7738e00ea02.tar.gz | |
5.1-security -> 5.5-security merge
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index f162c472362..9625fdab8e9 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -5837,6 +5837,7 @@ ha_innobase::index_read( DBUG_ENTER("index_read"); ut_a(prebuilt->trx == thd_to_trx(user_thd)); + ut_ad(key_len != 0 || find_flag != HA_READ_KEY_EXACT); ha_statistic_increment(&SSV::ha_read_key_count); |