Drizzle

Merge lp:~mordred/drizzle/bug583590 into lp:~drizzle-trunk/drizzle/development

  1. bug583590
  2. Merge into development
Proposed by Monty Taylor
Status: Merged
Merged at revision: 1597
Proposed branch: lp:~mordred/drizzle/bug583590
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 49 lines (+6/-6)
2 files modified
drizzled/schema_identifier.h (+2/-2)
drizzled/table_identifier.h (+4/-4)
To merge this branch: bzr merge lp:~mordred/drizzle/bug583590
Reviewer Review Type Date Requested Status
Brian Aker Pending
Review via email: mp+26887@code.launchpad.net

Description of the change

Fixes all the broken tests on solaris. I think there was an actual latent bug here.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'drizzled/schema_identifier.h'
2--- drizzled/schema_identifier.h 2010-03-31 18:01:35 +0000
3+++ drizzled/schema_identifier.h 2010-06-06 18:28:22 +0000
4@@ -57,9 +57,9 @@
5 // identifier for current db.
6 public:
7
8- const std::string &getLower()
9+ const std::string &getLower() const
10 {
11- return lower_db;
12+ return lower_db;
13 }
14
15 public:
16
17=== modified file 'drizzled/table_identifier.h'
18--- drizzled/table_identifier.h 2010-04-01 15:54:57 +0000
19+++ drizzled/table_identifier.h 2010-06-06 18:28:22 +0000
20@@ -133,9 +133,9 @@
21
22 void copyToTableMessage(message::Table &message);
23
24- bool operator<(TableIdentifier &right)
25+ friend bool operator<(const TableIdentifier &left, const TableIdentifier &right)
26 {
27- int first= getLower().compare(right.getLower());
28+ int first= left.getLower().compare(right.getLower());
29
30 if (first < 0)
31 {
32@@ -147,7 +147,7 @@
33 }
34 else
35 {
36- int val= lower_table_name.compare(right.lower_table_name);
37+ int val= left.lower_table_name.compare(right.lower_table_name);
38
39 if (val < 0)
40 {
41@@ -159,7 +159,7 @@
42 }
43 else
44 {
45- if (type < right.type)
46+ if (left.type < right.type)
47 {
48 return true;
49 }