[Commits] da80afb: Revert "Make sure that information schema knows also page compressed page"

Sergey Vojtovich svoj at mariadb.org
Thu Nov 27 12:19:31 EET 2014


Just playing with git, please disregard.

On Thu, Nov 27, 2014 at 09:41:44AM +0000, svoj at mariadb.org wrote:
> revision-id: da80afbe1c26e27a263bf15de9f3e8943f8533a4
> parent(s): 5a0896cb87afcfc9f99adb305a1060d39c07f6b1
> committer: Sergey Vojtovich
> branch nick: 10.1
> timestamp: 2014-11-27 13:41:28 +0400
> message:
> 
> Revert "Make sure that information schema knows also page compressed page"
> 
> This reverts commit c1f5f61c9b651cac80f22319beed13733963c632.
> 
> ---
>  storage/innobase/fil/fil0fil.cc | 5 +++--
>  storage/innobase/handler/i_s.cc | 1 -
>  storage/xtradb/fil/fil0fil.cc   | 5 +++--
>  storage/xtradb/handler/i_s.cc   | 1 -
>  4 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
> index 93245f9..8fd2b11 100644
> --- a/storage/innobase/fil/fil0fil.cc
> +++ b/storage/innobase/fil/fil0fil.cc
> @@ -2123,17 +2123,18 @@ static __attribute__((warn_unused_result))
>  	do not validate the first page. */
>  	if (!one_read_already) {
>  		*flags = fsp_header_get_flags(page);
> -		*space_id = fsp_header_get_space_id(page);
>  	}
>  
>  	/* Page is page compressed page, need to decompress, before
>  	continue. */
> -	if (fil_page_is_compressed(page)) {
> +	if (fsp_flags_is_page_compressed(*flags)) {
>  		ulint write_size=0;
>  		fil_decompress_page(NULL, page, UNIV_PAGE_SIZE, &write_size);
>  	}
>  
>  	if (!one_read_already) {
> +		*space_id = fsp_header_get_space_id(page);
> +
>  		check_msg = fil_check_first_page(page);
>  	}
>  
> diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
> index f6b3dbd..8d31ed8 100644
> --- a/storage/innobase/handler/i_s.cc
> +++ b/storage/innobase/handler/i_s.cc
> @@ -92,7 +92,6 @@ struct buf_page_desc_t{
>  	{"COMPRESSED_BLOB", FIL_PAGE_TYPE_ZBLOB},
>  	{"COMPRESSED_BLOB2", FIL_PAGE_TYPE_ZBLOB2},
>  	{"IBUF_INDEX", I_S_PAGE_TYPE_IBUF},
> -	{"PAGE COMPRESSED", FIL_PAGE_PAGE_COMPRESSED},
>  	{"UNKNOWN", I_S_PAGE_TYPE_UNKNOWN}
>  };
>  
> diff --git a/storage/xtradb/fil/fil0fil.cc b/storage/xtradb/fil/fil0fil.cc
> index 3143036..8e7758a 100644
> --- a/storage/xtradb/fil/fil0fil.cc
> +++ b/storage/xtradb/fil/fil0fil.cc
> @@ -2158,17 +2158,18 @@ static __attribute__((warn_unused_result))
>  	do not validate the first page. */
>  	if (!one_read_already) {
>  		*flags = fsp_header_get_flags(page);
> -		*space_id = fsp_header_get_space_id(page);
>  	}
>  
>  	/* Page is page compressed page, need to decompress, before
>  	continue. */
> -	if (fil_page_is_compressed(page)) {
> +	if (fsp_flags_is_page_compressed(*flags)) {
>  		ulint write_size=0;
>  		fil_decompress_page(NULL, page, UNIV_PAGE_SIZE, &write_size);
>  	}
>  
>  	if (!one_read_already) {
> +		*space_id = fsp_header_get_space_id(page);
> +
>  		check_msg = fil_check_first_page(page);
>  	}
>  
> diff --git a/storage/xtradb/handler/i_s.cc b/storage/xtradb/handler/i_s.cc
> index 20e3089..a0ba8c5 100644
> --- a/storage/xtradb/handler/i_s.cc
> +++ b/storage/xtradb/handler/i_s.cc
> @@ -103,7 +103,6 @@ struct buf_page_desc_t{
>  	{"COMPRESSED_BLOB", FIL_PAGE_TYPE_ZBLOB},
>  	{"COMPRESSED_BLOB2", FIL_PAGE_TYPE_ZBLOB2},
>  	{"IBUF_INDEX", I_S_PAGE_TYPE_IBUF},
> -	{"PAGE COMPRESSED", FIL_PAGE_PAGE_COMPRESSED},
>  	{"UNKNOWN", I_S_PAGE_TYPE_UNKNOWN}
>  };
>  
> _______________________________________________
> commits mailing list
> commits at mariadb.org
> https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits


More information about the commits mailing list