Drizzle

Merge lp:~kalebral-deactivatedaccount/drizzle/618759 into lp:~drizzle-trunk/drizzle/development

  1. 618759
  2. Merge into development
Proposed by Lee Bieber
Status: Merged
Approved by: Monty Taylor
Approved revision: 1712
Merged at revision: 1712
Proposed branch: lp:~kalebral-deactivatedaccount/drizzle/618759
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 13 lines (+3/-0)
1 file modified
plugin/myisam/mi_key.cc (+3/-0)
To merge this branch: bzr merge lp:~kalebral-deactivatedaccount/drizzle/618759
Reviewer Review Type Date Requested Status
Monty Taylor Approve
Review via email: mp+32787@code.launchpad.net

Description of the change

Fix OSX build issue

To post a comment you must log in.
Revision history for this message
Monty Taylor (mordred) wrote :

Yes. This is correct.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugin/myisam/mi_key.cc'
--- plugin/myisam/mi_key.cc 2010-02-04 08:14:46 +0000
+++ plugin/myisam/mi_key.cc 2010-08-16 16:44:44 +0000
@@ -23,6 +23,9 @@
23#include <math.h>23#include <math.h>
24#include <cassert>24#include <cassert>
2525
26using namespace drizzled;
27using namespace std;
28
26#define CHECK_KEYS /* Enable safety checks */29#define CHECK_KEYS /* Enable safety checks */
2730
28#define FIX_LENGTH(cs, pos, length, char_length) \31#define FIX_LENGTH(cs, pos, length, char_length) \