Commit f05b0d9c authored by Marko Mäkelä's avatar Marko Mäkelä

Merge mysql-5.1 to mysql-5.5.

parents e394ec77 5b6b89b4
/***************************************************************************** /*****************************************************************************
Copyright (c) 2005, 2011, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2005, 2013, Oracle and/or its affiliates. All Rights Reserved.
This program is free software; you can redistribute it and/or modify it under This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software the terms of the GNU General Public License as published by the Free Software
...@@ -837,11 +837,12 @@ page_zip_compress_node_ptrs( ...@@ -837,11 +837,12 @@ page_zip_compress_node_ptrs(
c_stream->next_in = (byte*) rec; c_stream->next_in = (byte*) rec;
c_stream->avail_in = rec_offs_data_size(offsets) c_stream->avail_in = rec_offs_data_size(offsets)
- REC_NODE_PTR_SIZE; - REC_NODE_PTR_SIZE;
ut_ad(c_stream->avail_in);
err = deflate(c_stream, Z_NO_FLUSH); if (c_stream->avail_in) {
if (UNIV_UNLIKELY(err != Z_OK)) { err = deflate(c_stream, Z_NO_FLUSH);
break; if (UNIV_UNLIKELY(err != Z_OK)) {
break;
}
} }
ut_ad(!c_stream->avail_in); ut_ad(!c_stream->avail_in);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment