diff options
| author | unknown <monty@nosik.monty.fi> | 2008-01-21 22:21:59 +0200 |
|---|---|---|
| committer | unknown <monty@nosik.monty.fi> | 2008-01-21 22:21:59 +0200 |
| commit | 5ffc919b9bc0e4e89ce964d7a1a8bf9a6dab8c91 (patch) | |
| tree | ac1d5b3f979002c5de1662bf3255628f53fd4525 /storage/maria/ma_pagecrc.c | |
| parent | fd74a0da30c43f542180687242f8bf919cc0f152 (diff) | |
| parent | 5cca615cafe821ac37354bafc8057b08ca998f62 (diff) | |
| download | mariadb-git-5ffc919b9bc0e4e89ce964d7a1a8bf9a6dab8c91.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-maria
into mysql.com:/home/my/mysql-maria
mysql-test/r/maria.result:
Auto merged
mysql-test/t/maria.test:
Auto merged
sql/sql_table.cc:
Auto merged
storage/maria/ma_create.c:
Auto merged
storage/maria/ma_pagecrc.c:
Auto merged
Diffstat (limited to 'storage/maria/ma_pagecrc.c')
| -rw-r--r-- | storage/maria/ma_pagecrc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/storage/maria/ma_pagecrc.c b/storage/maria/ma_pagecrc.c index 698cc8b95e0..f573ba132d2 100644 --- a/storage/maria/ma_pagecrc.c +++ b/storage/maria/ma_pagecrc.c @@ -305,6 +305,10 @@ my_bool maria_page_filler_set_none(uchar *page __attribute__((unused)), __attribute__((unused)), uchar *data_ptr __attribute__((unused))) { +#ifdef HAVE_purify + int4store_aligned(page + ((MARIA_SHARE *)data_ptr)->block_size - CRC_SIZE, + 0); +#endif return 0; } |