diff options
author | Michael Widenius <monty@mysql.com> | 2009-05-19 12:28:05 +0300 |
---|---|---|
committer | Michael Widenius <monty@mysql.com> | 2009-05-19 12:28:05 +0300 |
commit | 224108a19ec945ac1c3da6c5ec36b6777fd59444 (patch) | |
tree | 0c9eed2ea6f66b7a2416b6a663906a7841e33deb /storage/myisam/mi_check.c | |
parent | b94f191a776791e7a120c7e7829be4ffe8109823 (diff) | |
parent | db020fb30f56c1ec1b1e65304ad5a0830fddab34 (diff) | |
download | mariadb-git-224108a19ec945ac1c3da6c5ec36b6777fd59444.tar.gz |
Fixed problems in merge
mysql-test/r/information_schema.result:
Fixed a result file.
mysql-test/r/innodb-autoinc.result:
Fixed a result file.
mysql-test/t/connect.test:
Fixed a problem with merge, needed to close
connections and use the default
Diffstat (limited to 'storage/myisam/mi_check.c')
-rw-r--r-- | storage/myisam/mi_check.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c index 5a1c3189e54..b3f0106aed1 100644 --- a/storage/myisam/mi_check.c +++ b/storage/myisam/mi_check.c @@ -3147,7 +3147,7 @@ static int sort_key_read(MI_SORT_PARAM *sort_param, void *key) (info->s->rec_reflength+ _mi_make_key(info, sort_param->key, (uchar*) key, sort_param->record, sort_param->filepos)); -#ifdef HAVE_purify +#ifdef HAVE_valgrind bzero(key+sort_param->real_key_length, (sort_param->key_length-sort_param->real_key_length)); #endif @@ -3187,7 +3187,7 @@ static int sort_ft_key_read(MI_SORT_PARAM *sort_param, void *key) sort_param->real_key_length=(info->s->rec_reflength+ _ft_make_key(info, sort_param->key, key, wptr++, sort_param->filepos)); -#ifdef HAVE_purify +#ifdef HAVE_valgrind if (sort_param->key_length > sort_param->real_key_length) bzero(key+sort_param->real_key_length, (sort_param->key_length-sort_param->real_key_length)); |