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

[Andrew Hutchings]

Fix segfault when using .temporary which was caused by the error handler hook not set yet and .temporary created as the wrong user.

Message handler hook is set earlier and .temporary is now created after set_user.

[Andrew Hutchings (linuxjedi)]

Figuring out a dtr test case for this

review: Needs Fixing

[Andrew Hutchings (linuxjedi)]

dtr test case not currently possible (and not going to be possible 'soon'), having the fix in code is possibly more important.

[Monty Taylor (mordred)]

lgtm

review: Approve

=== modified file 'drizzled/drizzled.cc'
--- drizzled/drizzled.cc	2010-08-24 01:36:17 +0000
+++ drizzled/drizzled.cc	2010-08-27 22:27:48 +0000
@@ -710,8 +710,16 @@
   internal::load_defaults(conf_file_name, groups, &argc, &argv);
   defaults_argv=argv;
   defaults_argc=argc;
+  string progname(argv[0]);
   get_options(&defaults_argc, defaults_argv);
 
+  if ((user_info= check_user(drizzled_user)))
+  {
+    set_user(drizzled_user, user_info);
+  }
+
+  fix_paths(progname);
+
   current_pid= getpid();		/* Save for later ref */
   init_time();				/* Init time-functions (read zone) */
 
@@ -1603,8 +1611,6 @@
 
   my_getopt_error_reporter= option_error_reporter;
 
-  string progname(argv[0]);
-
   /* Skip unknown options so that they may be processed later by plugins */
   my_getopt_skip_unknown= true;
 
@@ -1635,7 +1641,6 @@
 
   if (drizzled_chroot)
     set_root(drizzled_chroot);
-  fix_paths(progname);
 
   /*
     Set some global variables from the global_system_variables

=== modified file 'drizzled/main.cc'
--- drizzled/main.cc	2010-08-18 16:12:58 +0000
+++ drizzled/main.cc	2010-08-27 22:27:48 +0000
@@ -229,6 +229,13 @@
 
   google::protobuf::SetLogHandler(&GoogleProtoErrorThrower);
 
+  /*
+    init signals & alarm
+    After this we can't quit by a simple unireg_abort
+  */
+  error_handler_hook= my_message_sql;
+
+
   if (init_common_variables(DRIZZLE_CONFIG_NAME,
 			    argc, argv, load_default_groups))
     unireg_abort(1);				// Will do exit
@@ -249,11 +256,6 @@
   data_home[1]=0;
   data_home_len= 2;
 
-  if ((user_info= check_user(drizzled_user)))
-  {
-    set_user(drizzled_user, user_info);
-  }
-
   if (server_id == 0)
   {
     server_id= 1;
@@ -279,12 +281,6 @@
   if (plugin::Listen::setup())
     unireg_abort(1);
 
-  /*
-    init signals & alarm
-    After this we can't quit by a simple unireg_abort
-  */
-  error_handler_hook= my_message_sql;
-
   assert(plugin::num_trx_monitored_objects > 0);
   if (drizzle_rm_tmp_tables() ||
       my_tz_init((Session *)0, default_tz_name))