diff options
| author | tomas@poseidon.ndb.mysql.com <> | 2005-07-12 20:01:22 +0200 |
|---|---|---|
| committer | tomas@poseidon.ndb.mysql.com <> | 2005-07-12 20:01:22 +0200 |
| commit | 674b6bb15140673107bacb1574e8e26f51ff002e (patch) | |
| tree | 8fd7b30e9e4cce3fdfc60e700fdb2d668f2f6449 /storage/heap | |
| parent | 9743190cd90c7a51dfb23d5cbdca4b04fb7e6ae0 (diff) | |
| parent | e06e06ffeb8dbcd2737720be9f78c5fe75b9c0f5 (diff) | |
| download | mariadb-git-674b6bb15140673107bacb1574e8e26f51ff002e.tar.gz | |
Merge
Diffstat (limited to 'storage/heap')
| -rw-r--r-- | storage/heap/Makefile.am | 2 | ||||
| -rw-r--r-- | storage/heap/hp_hash.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/storage/heap/Makefile.am b/storage/heap/Makefile.am index f9f0ba775ff..2890dc6ee23 100644 --- a/storage/heap/Makefile.am +++ b/storage/heap/Makefile.am @@ -14,7 +14,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -INCLUDES = -I$(top_srcdir)/include +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include LDADD = libheap.a $(top_srcdir)/mysys/libmysys.a \ $(top_srcdir)/dbug/libdbug.a \ $(top_srcdir)/strings/libmystrings.a diff --git a/storage/heap/hp_hash.c b/storage/heap/hp_hash.c index 9e4636ebdc0..d643f776731 100644 --- a/storage/heap/hp_hash.c +++ b/storage/heap/hp_hash.c @@ -552,9 +552,9 @@ int hp_rec_key_cmp(HP_KEYDEF *keydef, const byte *rec1, const byte *rec2, if (cs->mbmaxlen > 1) { uint char_length= seg->length / cs->mbmaxlen; - char_length1= my_charpos(cs, pos1, pos1 + char_length1, char_length); + char_length1= my_charpos(cs, pos1, pos1 + char_length1, char_length1); set_if_smaller(char_length1, seg->length); - char_length2= my_charpos(cs, pos2, pos2 + char_length2, char_length); + char_length2= my_charpos(cs, pos2, pos2 + char_length2, char_length2); set_if_smaller(char_length2, seg->length); } |