Drizzle

Merge lp://staging/~diego-fmpwizard/drizzle/innodb-plugin-merge-fixes into lp://staging/~mordred/drizzle/innodb-plugin-merge

  1. innodb-plugin-merge-fixes
  2. Merge into innodb-plugin-merge
Proposed by fmpwizard
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~diego-fmpwizard/drizzle/innodb-plugin-merge-fixes
Merge into: lp://staging/~mordred/drizzle/innodb-plugin-merge
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~diego-fmpwizard/drizzle/innodb-plugin-merge-fixes
Reviewer Review Type Date Requested Status
Drizzle Developers Pending
Review via email: mp+11640@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
fmpwizard (diego-fmpwizard) wrote :

I added a defined() so that it compiles on Fedora 11 (otherwise, you get an error similar to undefined HAVE_WINDOWS_ATOMICS while on the make step)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugin/innobase/srv/srv0start.c'
--- plugin/innobase/srv/srv0start.c 2009-08-17 18:17:53 +0000
+++ plugin/innobase/srv/srv0start.c 2009-09-12 01:55:08 +0000
@@ -1121,7 +1121,7 @@
1121 fprintf(stderr,1121 fprintf(stderr,
1122 "InnoDB: Mutexes use Solaris atomic functions.\n");1122 "InnoDB: Mutexes use Solaris atomic functions.\n");
1123# endif /* INNODB_RW_LOCKS_USE_ATOMICS */1123# endif /* INNODB_RW_LOCKS_USE_ATOMICS */
1124#elif HAVE_WINDOWS_ATOMICS1124#elif defined(HAVE_WINDOWS_ATOMICS)
1125# ifdef INNODB_RW_LOCKS_USE_ATOMICS1125# ifdef INNODB_RW_LOCKS_USE_ATOMICS
1126 fprintf(stderr,1126 fprintf(stderr,
1127 "InnoDB: Mutexes and rw_locks use Windows interlocked functions.\n");1127 "InnoDB: Mutexes and rw_locks use Windows interlocked functions.\n");

Subscribers

People subscribed via source and target branches

to all changes: