Drizzle

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

Proposed by fmpwizard on 2009-09-12

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
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Drizzle Developers		2009-09-12	Pending
Review via email: mp+11640@code.staging.launchpad.net

Revision history for this message

fmpwizard (diego-fmpwizard) wrote on 2009-09-12:

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)

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'plugin/innobase/srv/srv0start.c'
2	--- plugin/innobase/srv/srv0start.c 2009-08-17 18:17:53 +0000
3	+++ plugin/innobase/srv/srv0start.c 2009-09-12 01:55:08 +0000
4	@@ -1121,7 +1121,7 @@
5	fprintf(stderr,
6	"InnoDB: Mutexes use Solaris atomic functions.\n");
7	# endif /* INNODB_RW_LOCKS_USE_ATOMICS */
8	-#elif HAVE_WINDOWS_ATOMICS
9	+#elif defined(HAVE_WINDOWS_ATOMICS)
10	# ifdef INNODB_RW_LOCKS_USE_ATOMICS
11	fprintf(stderr,
12	"InnoDB: Mutexes and rw_locks use Windows interlocked functions.\n");