diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2006-11-29 22:51:09 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2006-11-29 22:51:09 +0200 |
| commit | 23263db66eb19b6779c6bd8708e1c3b08692eebb (patch) | |
| tree | d9287bcf6cac6fec1a2d75f4ea0cb4afc3e6926f /mysys/ptr_cmp.c | |
| parent | 93f246d4c196d813f3870586534372d13b51fb03 (diff) | |
| download | mariadb-git-23263db66eb19b6779c6bd8708e1c3b08692eebb.tar.gz | |
Added back sql-bench directory, so that one can more easily run benchmarks on a server and add new benchmarks for new optimizations
Fixed memory leak in _db_set() (Bug#24497 Valgrind warning: get_one_option)
Don't call net_clear() on COM_QUIT. This avoids a warning from net_clear() after shutdown: "skipped ## bytes from file"
BUG#21428: skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
Diffstat (limited to 'mysys/ptr_cmp.c')
| -rw-r--r-- | mysys/ptr_cmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/ptr_cmp.c b/mysys/ptr_cmp.c index 57778574bb6..28f050c70d9 100644 --- a/mysys/ptr_cmp.c +++ b/mysys/ptr_cmp.c @@ -185,7 +185,7 @@ my_off_t my_get_ptr(byte *ptr, uint pack_length) case 4: pos= (my_off_t) mi_uint4korr(ptr); break; case 3: pos= (my_off_t) mi_uint3korr(ptr); break; case 2: pos= (my_off_t) mi_uint2korr(ptr); break; - case 1: pos= (my_off_t) mi_uint2korr(ptr); break; + case 1: pos= (my_off_t) *(uchar*) ptr; break; default: DBUG_ASSERT(0); } return pos; |