Merge lp:~linuxjedi/drizzle/trunk-bug-738024 into lp:~drizzle-trunk/drizzle/development

[Andrew Hutchings]

Fix default user for console plugin

[Olaf van der Spek (olafvdspek)]

Shouldn't option defaults be used instead?

review: Needs Fixing

[Andrew Hutchings (linuxjedi)]

> Shouldn't option defaults be used instead?

Probably, but since none of that plugin uses option defaults that is a separate issue for a separate bug report. Please feel free to file it.

[Olaf van der Spek (olafvdspek)]

On Sun, Mar 20, 2011 at 3:41 PM, Andrew Hutchings
<email address hidden> wrote:
>> Shouldn't option defaults be used instead?
>
> Probably, but since none of that plugin uses option defaults that is a separate issue for a separate bug report.  Please feel free to file it.

Done
But why not fix it while you're working on the code anyway?

--
Olaf

[Andrew Hutchings (linuxjedi)]

Mostly because there are many things broken in very minor ways with the options processing and I didn't have time to fix them all now. This was more urgent with code that stewart was working on.

[Lee Bieber (kalebral-deactivatedaccount)]

Tests all fail

http://hudson.drizzle.org/view/Drizzle-param/job/drizzle-param-distcheck/90/console

[Lee Bieber (kalebral-deactivatedaccount)]

http://hudson.drizzle.org/view/Drizzle-param/job/drizzle-param-distcheck/90/console

review: Needs Fixing

[Andrew Hutchings (linuxjedi)]

I can't reproduce this with distcheck and that server doesn't have logs from that build. Are there any other servers it failed on I can look into?

[Olaf van der Spek (olafvdspek)]

On Mon, Mar 21, 2011 at 11:27 AM, Andrew Hutchings
<email address hidden> wrote:
> I can't reproduce this with distcheck and that server doesn't have logs from that build.  Are there any other servers it failed on I can look into?

Try make check

--
Olaf

[Olaf van der Spek (olafvdspek)]

std::string can't be NULL. If username and password are not provided and get_login() = NULL, you do username = NULL, but password = "".

[Andrew Hutchings (linuxjedi)]

ok, I didn't realise I had done that. Note for the future: don't patch when you are ill, stressed and haven't slept for 3 days ;)

[lp:~linuxjedi/drizzle/trunk-bug-738024]

2244. By Andrew Hutchings on 2011-03-21

This is what I mean to do to fix the console plugin, doh!

[Andrew Hutchings (linuxjedi)]

Lee: should be good now

[Lee Bieber (kalebral-deactivatedaccount)]

New valgrind warnings

review: Needs Fixing

[Andrew Hutchings (linuxjedi)]

abandoning this, taking a different approach due to a new bug

Unmerged revisions

2244. By Andrew Hutchings on 2011-03-21

This is what I mean to do to fix the console plugin, doh!

2243. By Andrew Hutchings on 2011-03-20

Add console default user

=== modified file 'plugin/console/console.cc'
--- plugin/console/console.cc	2011-03-15 21:30:35 +0000
+++ plugin/console/console.cc	2011-03-21 12:05:55 +0000
@@ -366,8 +366,9 @@
 
 static int init(drizzled::module::Context &context)
 {
+  const char* unix_user= getlogin();
   const module::option_map &vm= context.getOptions();
-  const string username(vm.count("username") ? vm["username"].as<string>() : "");
+  const string username(vm.count("username") ? vm["username"].as<string>() : (unix_user ? unix_user : ""));
   const string password(vm.count("password") ? vm["password"].as<string>() : "");
   const string schema(vm.count("schema") ? vm["schema"].as<string>() : "");