Merge lp:~drizzle-pbxt/drizzle/drizzle-pbxt-4-drizzle into lp:~drizzle-trunk/drizzle/development

Proposed by Vladimir Kolesnikov
Status: Rejected
Rejected by: Stewart Smith
Proposed branch: lp:~drizzle-pbxt/drizzle/drizzle-pbxt-4-drizzle
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 21 lines (+2/-2)
1 file modified
drizzled/schema_identifier.cc (+2/-2)
To merge this branch: bzr merge lp:~drizzle-pbxt/drizzle/drizzle-pbxt-4-drizzle
Reviewer Review Type Date Requested Status
Stewart Smith (community) Needs Fixing
Review via email: mp+22822@code.launchpad.net

Description of the change

lp:drizzle r.1439 + changes on drizzle side needed for pbxt

To post a comment you must log in.
Revision history for this message
Stewart Smith (stewart) wrote :

I think either SchemaIdentifier::getPath should be used, or a new SchemaIdentifier::getFilenameWithoutPath() introduced.

review: Needs Fixing
Revision history for this message
Vladimir Kolesnikov (vkolesnikov) wrote :

I managed to avoid using this function, so there's no need in this patch anymore.

Revision history for this message
Stewart Smith (stewart) wrote :

set to 'rejected' because there's no "no longer needed" status.

Unmerged revisions

1440. By Vladimir Kolesnikov

lp:drizzle + changes needed for pbxt

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'drizzled/schema_identifier.cc'
2--- drizzled/schema_identifier.cc 2010-03-31 18:01:35 +0000
3+++ drizzled/schema_identifier.cc 2010-04-05 19:55:35 +0000
4@@ -42,7 +42,7 @@
5
6 static const char hexchars[]= "0123456789abcdef";
7
8-static bool tablename_to_filename(const char *from, char *to, size_t to_length);
9+bool tablename_to_filename(const char *from, char *to, size_t to_length);
10
11 static size_t build_schema_filename(std::string &path, const char *db)
12 {
13@@ -91,7 +91,7 @@
14 RETURN
15 true if errors happen. false on success.
16 */
17-static bool tablename_to_filename(const char *from, char *to, size_t to_length)
18+bool tablename_to_filename(const char *from, char *to, size_t to_length)
19 {
20
21 size_t length= 0;