Skip to content

Commit d01c818

Browse files
committed
fix a compilation problem with mysql 5.6.11
1 parent a852927 commit d01c818

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@ regtest/*/*.log
3333
regtest/*/*.log2
3434
regtest/*/DONE
3535
dist/*
36+
ar-lib

handlersocket/database.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -812,14 +812,22 @@ dbcontext::cmd_find_internal(dbcallback_i& cb, const prep_stmt& pst,
812812
if (is_first) {
813813
is_first = false;
814814
const key_part_map kpm = (1U << args.kvalslen) - 1;
815+
#if MYSQL_VERSION_ID >= 50611
816+
r = hnd->ha_index_read_map(table->record[0], key_buf, kpm, find_flag);
817+
#else
815818
r = hnd->index_read_map(table->record[0], key_buf, kpm, find_flag);
819+
#endif
816820
} else if (args.invalues_keypart >= 0) {
817821
if (++invalues_idx >= args.invalueslen) {
818822
break;
819823
}
820824
kplen_sum = prepare_keybuf(args, key_buf, table, kinfo, invalues_idx);
821825
const key_part_map kpm = (1U << args.kvalslen) - 1;
826+
#if MYSQL_VERSION_ID >= 50611
827+
r = hnd->ha_index_read_map(table->record[0], key_buf, kpm, find_flag);
828+
#else
822829
r = hnd->index_read_map(table->record[0], key_buf, kpm, find_flag);
830+
#endif
823831
} else {
824832
switch (find_flag) {
825833
case HA_READ_BEFORE_KEY:
@@ -839,7 +847,11 @@ dbcontext::cmd_find_internal(dbcallback_i& cb, const prep_stmt& pst,
839847
#endif
840848
break;
841849
case HA_READ_KEY_EXACT:
850+
#if MYSQL_VERSION_ID >= 50611
851+
r = hnd->ha_index_next_same(table->record[0], key_buf, kplen_sum);
852+
#else
842853
r = hnd->index_next_same(table->record[0], key_buf, kplen_sum);
854+
#endif
843855
break;
844856
default:
845857
r = HA_ERR_END_OF_FILE; /* to finish the loop */

0 commit comments

Comments
 (0)