diff options
author | unknown <knielsen@knielsen-hq.org> | 2010-04-28 16:35:00 +0200 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2010-04-28 16:35:00 +0200 |
commit | 9f9629ca820d77fa7ea77afaa316b127f22ee007 (patch) | |
tree | 38427051e417a093270aa5047e4b044c82bca805 /storage/xtradb/include/trx0sys.h | |
parent | af2309a1709cd710dee72597ee7bb3bf93a90159 (diff) | |
parent | 3e4d2be619d1d67f6d7405514295d4faf21d39c5 (diff) | |
download | mariadb-git-9f9629ca820d77fa7ea77afaa316b127f22ee007.tar.gz |
Merge XtraDB 10 into MariaDB.
Diffstat (limited to 'storage/xtradb/include/trx0sys.h')
-rw-r--r-- | storage/xtradb/include/trx0sys.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/xtradb/include/trx0sys.h b/storage/xtradb/include/trx0sys.h index 8789d575bca..13d93d5a77a 100644 --- a/storage/xtradb/include/trx0sys.h +++ b/storage/xtradb/include/trx0sys.h @@ -487,9 +487,9 @@ in size */ /** Contents of TRX_SYS_MYSQL_LOG_MAGIC_N_FLD */ #define TRX_SYS_MYSQL_LOG_MAGIC_N 873422344 -#if UNIV_PAGE_SIZE < 4096 -# error "UNIV_PAGE_SIZE < 4096" -#endif +//#if UNIV_PAGE_SIZE < 4096 +//# error "UNIV_PAGE_SIZE < 4096" +//#endif /** The offset of the MySQL replication info in the trx system header; this contains the same fields as TRX_SYS_MYSQL_LOG_INFO below */ #define TRX_SYS_MYSQL_MASTER_LOG_INFO (UNIV_PAGE_SIZE - 2000) |