[Commits] Rev 2862: fixes for make dist and 32-bit OS in http://bazaar.launchpad.net/~maria-captains/maria/5.2/

serg at askmonty.org serg at askmonty.org
Wed Sep 15 09:07:00 EEST 2010


At http://bazaar.launchpad.net/~maria-captains/maria/5.2/

------------------------------------------------------------
revno: 2862
revision-id: sergii at pisem.net-20100915060657-4xx8w1xh3qt3xgzs
parent: sergii at pisem.net-20100915054718-jsvwgoe593rt52wc
committer: Sergei Golubchik <sergii at pisem.net>
branch nick: 5.2
timestamp: Wed 2010-09-15 08:06:57 +0200
message:
  fixes for make dist and 32-bit OS
-------------- next part --------------
=== modified file 'mysql-test/suite/maria/t/compat_aliases.test'
--- a/mysql-test/suite/maria/t/compat_aliases.test	2010-09-14 21:06:54 +0000
+++ b/mysql-test/suite/maria/t/compat_aliases.test	2010-09-15 06:06:57 +0000
@@ -51,6 +51,7 @@ set session aria_sort_buffer_size=@old_s
 set @old_max_sort_file_size=@@global.maria_max_sort_file_size,
     @old_repair_threads=@@global.aria_repair_threads;
 set @@global.maria_max_sort_file_size=default, @@global.aria_repair_threads=default;
+--replace_result 4293918720 9223372036853727232
 select @@global.maria_max_sort_file_size, @@global.aria_repair_threads;
 set @@global.aria_max_sort_file_size=@old_max_sort_file_size,
     @@global.maria_repair_threads=@old_repair_threads;

=== modified file 'storage/maria/CMakeLists.txt'
--- a/storage/maria/CMakeLists.txt	2010-09-12 16:40:01 +0000
+++ b/storage/maria/CMakeLists.txt	2010-09-15 06:06:57 +0000
@@ -43,7 +43,7 @@ SET(ARIA_SOURCES ma_init.c ma_open.c ma_
             ha_maria.cc trnman.c lockman.c tablockman.c 
             ma_rt_index.c ma_rt_key.c ma_rt_mbr.c ma_rt_split.c 
             ma_sp_key.c ma_control_file.c ma_loghandler.c 
-            ma_pagecache.c ma_pagecaches.c 
+            ma_pagecache.c ma_pagecaches.c compat_aliases.cc compat_aliases.h
             ma_checkpoint.c ma_recovery.c ma_commit.c ma_pagecrc.c
             ha_maria.h maria_def.h ma_recovery_util.c ma_servicethread.c
 )



More information about the commits mailing list