Below is the list of changes that have just been committed into a local
6.0 repository of guilhem. When guilhem does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-11-29 19:47:02+01:00, guilhem@stripped +1 -0
WL#866 "online backup driver for MyISAM" gcc warnings fixes
storage/myisam/mi_log.c@stripped, 2007-11-29 19:46:59+01:00, guilhem@stripped +16 -2
fix for compiler warnings -Wuninitialized
diff -Nrup a/storage/myisam/mi_log.c b/storage/myisam/mi_log.c
--- a/storage/myisam/mi_log.c 2007-11-29 11:23:27 +01:00
+++ b/storage/myisam/mi_log.c 2007-11-29 19:46:59 +01:00
@@ -299,8 +299,22 @@ void _myisam_log_command(IO_CACHE *log,
ulong pid=(ulong) GETPID();
my_bool logical= (log == &myisam_logical_log);
MYISAM_SHARE *share;
- File file= logical ? ((MI_INFO *)info_or_share)->dfile :
- (share= (MYISAM_SHARE *)info_or_share)->kfile;
+ File file;
+
+ /*
+ Speed in online backup (physical log) matters more than in debugging
+ (logical log) so we use unlikely().
+ */
+ if (unlikely(logical))
+ {
+ file= ((MI_INFO *)info_or_share)->dfile;
+ LINT_INIT(share);
+ }
+ else
+ {
+ file= (share= (MYISAM_SHARE *)info_or_share)->kfile;
+ LINT_INIT(error);
+ }
DBUG_ASSERT(command == MI_LOG_OPEN || command == MI_LOG_DELETE ||
command == MI_LOG_CLOSE || command == MI_LOG_EXTRA ||
| Thread |
|---|
| • bk commit into 6.0 tree (guilhem:1.2705) WL#866 | Guilhem Bichot | 29 Nov |