See log messages for details. - Alex
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: abudov...@gmail.com-20100114054116-0o9j13rkdgekujcj # target_branch: bzr+ssh://bazaar.launchpad.net/~maria-\ # captains/maria/5.1/ # testament_sha1: acd9bb4c13af5c51871ebc2eaa884ebced4192b2 # timestamp: 2010-01-14 16:46:47 +1100 # base_revision_id: mo...@askmonty.org-20100112173111-yj9651464x04ggba # # Begin patch === modified file 'include/my_pthread.h' --- include/my_pthread.h 2009-06-30 12:01:29 +0000 +++ include/my_pthread.h 2010-01-14 05:41:16 +0000 @@ -543,9 +543,9 @@ #else #define my_pthread_mutex_init(A,B,C,D) pthread_mutex_init((A),(B)) #define my_pthread_mutex_lock(A,B) pthread_mutex_lock(A) -#define safe_mutex_assert_owner(mp) -#define safe_mutex_assert_not_owner(mp) -#define safe_mutex_free_deadlock_data(mp) +#define safe_mutex_assert_owner(mp) ((void)0) /* Do nothing */ +#define safe_mutex_assert_not_owner(mp) ((void)0) +#define safe_mutex_free_deadlock_data(mp) ((void)0) #endif /* SAFE_MUTEX */ #if defined(MY_PTHREAD_FASTMUTEX) && !defined(SAFE_MUTEX)
=== modified file 'sql/handler.h' --- sql/handler.h 2010-01-04 13:12:53 +0000 +++ sql/handler.h 2010-01-14 04:17:19 +0000 @@ -891,9 +891,9 @@ ulonglong delete_length; ha_rows records; ulong mean_rec_length; - ulong create_time; - ulong check_time; - ulong update_time; + time_t create_time; + time_t check_time; + time_t update_time; ulonglong check_sum; } PARTITION_INFO; @@ -1060,9 +1060,9 @@ ha_rows records; ha_rows deleted; /* Deleted records */ ulong mean_rec_length; /* physical reclength */ - ulong create_time; /* When table was created */ - ulong check_time; - ulong update_time; + time_t create_time; /* When table was created */ + time_t check_time; + time_t update_time; uint block_size; /* index block size */ ha_statistics(): === modified file 'sql/set_var.cc' --- sql/set_var.cc 2009-12-03 11:19:05 +0000 +++ sql/set_var.cc 2010-01-14 01:46:29 +0000 @@ -58,6 +58,11 @@ #include <my_getopt.h> #include <thr_alarm.h> #include <myisam.h> + +#ifdef WITH_MARIA_STORAGE_ENGINE +#include <maria.h> +#endif + #include <my_dir.h> #include <waiting_threads.h> #include "events.h" === modified file 'storage/xtradb/handler/ha_innodb.cc' --- storage/xtradb/handler/ha_innodb.cc 2009-12-03 11:34:11 +0000 +++ storage/xtradb/handler/ha_innodb.cc 2010-01-14 04:17:19 +0000 @@ -61,7 +61,9 @@ #pragma implementation // gcc: Class implementation #endif +#ifndef MYSQL_SERVER #define MYSQL_SERVER +#endif #include <mysql_priv.h> #ifdef MYSQL_SERVER # Begin bundle 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
_______________________________________________ Mailing list: https://launchpad.net/~maria-developers Post to : maria-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~maria-developers More help : https://help.launchpad.net/ListHelp
