diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-03-20 02:06:08 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-03-20 02:06:08 +0200 |
| commit | 97cd4fb127f4096f2196a71778a15c8183aa7784 (patch) | |
| tree | 025fe4204ddb1d72e14a98b1df497f7329939ebd /myisam | |
| parent | 161942e3cefd8923633e0a7b3b7a9860a95f6fbc (diff) | |
| parent | c2297fb5ecaf2e98b21ae8287535d0b7fbced34b (diff) | |
| download | mariadb-git-97cd4fb127f4096f2196a71778a15c8183aa7784.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
configure.in:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/sp_key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/sp_key.c b/myisam/sp_key.c index 82c2b1f8510..f0b53b541b8 100644 --- a/myisam/sp_key.c +++ b/myisam/sp_key.c @@ -47,7 +47,7 @@ uint sp_make_key(register MI_INFO *info, uint keynr, uchar *key, dlen = _mi_calc_blob_length(keyseg->bit_start, pos); memcpy_fixed(&dptr, pos + keyseg->bit_start, sizeof(char*)); - sp_mbr_from_wkb(dptr, dlen, SPDIMS, mbr); + sp_mbr_from_wkb(dptr + 4, dlen - 4, SPDIMS, mbr); /* SRID */ for (i = 0, keyseg = keyinfo->seg; keyseg->type; keyseg++, i++) { |