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 /sql/ha_partition.cc | |
| 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 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 1aa43fd6a51..79724ebcc60 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -3548,10 +3548,10 @@ void ha_partition::position(const uchar *record) (ref_length - PARTITION_BYTES_IN_POS)); #ifdef SUPPORTING_PARTITION_OVER_DIFFERENT_ENGINES -#ifdef HAVE_purify +#ifdef HAVE_valgrind bzero(ref + PARTITION_BYTES_IN_POS + ref_length, max_ref_length-ref_length); -#endif /* HAVE_purify */ +#endif /* HAVE_valgrind */ #endif DBUG_VOID_RETURN; } |