diff options
| author | Jan Lindström <jan.lindstrom@skysql.com> | 2014-08-06 15:39:15 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@skysql.com> | 2014-08-26 15:43:46 +0300 |
| commit | df4dd593f29aec8e2116aec1775ad4b8833d8c93 (patch) | |
| tree | becae67f02054e15ead58e929e91c044f0b7aa15 /storage/xtradb/fil | |
| parent | e974b564389af8251c2ba51060e6129e45431586 (diff) | |
| download | mariadb-git-df4dd593f29aec8e2116aec1775ad4b8833d8c93.tar.gz | |
MDEV-6247: Merge 10.0-galera to 10.1.
Merged lp:maria/maria-10.0-galera up to revision 3879.
Added a new functions to handler API to forcefully abort_transaction,
producing fake_trx_id, get_checkpoint and set_checkpoint for XA. These
were added for future possiblity to add more storage engines that
could use galera replication.
Diffstat (limited to 'storage/xtradb/fil')
| -rw-r--r-- | storage/xtradb/fil/fil0fil.cc | 32 | ||||
| -rw-r--r-- | storage/xtradb/fil/fil0pagecompress.cc | 2 |
2 files changed, 18 insertions, 16 deletions
diff --git a/storage/xtradb/fil/fil0fil.cc b/storage/xtradb/fil/fil0fil.cc index d40cfa57bd5..343cc0f47c4 100644 --- a/storage/xtradb/fil/fil0fil.cc +++ b/storage/xtradb/fil/fil0fil.cc @@ -6833,36 +6833,36 @@ fil_get_page_type_name( { switch(page_type) { case FIL_PAGE_PAGE_COMPRESSED: - return "PAGE_COMPRESSED"; + return (char *)"PAGE_COMPRESSED"; case FIL_PAGE_INDEX: - return "INDEX"; + return (char *)"INDEX"; case FIL_PAGE_UNDO_LOG: - return "UNDO LOG"; + return (char *)"UNDO LOG"; case FIL_PAGE_INODE: - return "INODE"; + return (char *)"INODE"; case FIL_PAGE_IBUF_FREE_LIST: - return "IBUF_FREE_LIST"; + return (char *)"IBUF_FREE_LIST"; case FIL_PAGE_TYPE_ALLOCATED: - return "ALLOCATED"; + return (char *)"ALLOCATED"; case FIL_PAGE_IBUF_BITMAP: - return "IBUF_BITMAP"; + return (char *)"IBUF_BITMAP"; case FIL_PAGE_TYPE_SYS: - return "SYS"; + return (char *)"SYS"; case FIL_PAGE_TYPE_TRX_SYS: - return "TRX_SYS"; + return (char *)"TRX_SYS"; case FIL_PAGE_TYPE_FSP_HDR: - return "FSP_HDR"; + return (char *)"FSP_HDR"; case FIL_PAGE_TYPE_XDES: - return "XDES"; + return (char *)"XDES"; case FIL_PAGE_TYPE_BLOB: - return "BLOB"; + return (char *)"BLOB"; case FIL_PAGE_TYPE_ZBLOB: - return "ZBLOB"; + return (char *)"ZBLOB"; case FIL_PAGE_TYPE_ZBLOB2: - return "ZBLOB2"; + return (char *)"ZBLOB2"; case FIL_PAGE_TYPE_COMPRESSED: - return "ORACLE PAGE COMPRESSED"; + return (char *)"ORACLE PAGE COMPRESSED"; default: - return "PAGE TYPE CORRUPTED"; + return (char *)"PAGE TYPE CORRUPTED"; } } diff --git a/storage/xtradb/fil/fil0pagecompress.cc b/storage/xtradb/fil/fil0pagecompress.cc index 854b094ea81..ec19a4ef4b7 100644 --- a/storage/xtradb/fil/fil0pagecompress.cc +++ b/storage/xtradb/fil/fil0pagecompress.cc @@ -487,7 +487,9 @@ fil_decompress_page( ulint actual_size = 0; ulint compression_alg = 0; byte *in_buf; +#ifdef HAVE_LZO ulint olen=0; +#endif ulint ptype; ut_ad(buf); |