Merge lp:~skinny.moey/drizzle/show_variables_582975 into lp:~drizzle-trunk/drizzle/development

[Joe Daly]

fix for "show variables" not displaying the scheduler bug #582975

[Monty Taylor (mordred)]

Looks mostly good. However ...

opt_scheduler_default= (char*) "multi_thread";

Casting a static const char * to a char * is something I've been trying to get rid of in the tree in general. Is there a reason you needed to go away from from the const string here?

review: Needs Information

[Joe Daly (skinny.moey)]

> Looks mostly good. However ...
>
> opt_scheduler_default= (char*) "multi_thread";
>
> Casting a static const char * to a char * is something I've been trying to get
> rid of in the tree in general. Is there a reason you needed to go away from
> from the const string here?

The constructor for sys_var_const_str_ptr() expects a char** so to leave the const string here I would need to do a cast of (char*) opt_scheduler_default.c_str() or strcpy() to set the value of opt_scheduler which gets passed into sys_var_const_str_ptr(). What I did above seemed like the best choice. I looked into changing the constructor for sys_var_const_str_ptr() to accept const char** but that sent me down problems with other variables that were not const. Maybe Im missing something?

[Monty Taylor (mordred)]

Ok. Fair enough. I can't wait until this is systemically fixed. I really hate all the casting nonsense.

review: Approve

=== modified file 'drizzled/drizzled.cc'
--- drizzled/drizzled.cc	2010-05-21 18:25:00 +0000
+++ drizzled/drizzled.cc	2010-05-23 00:13:27 +0000
@@ -218,7 +218,7 @@
 bool volatile select_thread_in_use;
 bool volatile abort_loop;
 bool volatile shutdown_in_progress;
-const string opt_scheduler_default("multi_thread");
+char *opt_scheduler_default;
 char *opt_scheduler= NULL;
 
 size_t my_thread_stack_size= 65536;
@@ -996,6 +996,7 @@
   else
   {
     scheduler_name= opt_scheduler_default;
+    opt_scheduler= opt_scheduler_default; 
   }
 
   if (plugin::Scheduler::setPlugin(scheduler_name))
@@ -1555,6 +1556,7 @@
   max_system_variables.select_limit=    (uint64_t) HA_POS_ERROR;
   global_system_variables.max_join_size= (uint64_t) HA_POS_ERROR;
   max_system_variables.max_join_size=   (uint64_t) HA_POS_ERROR;
+  opt_scheduler_default= (char*) "multi_thread";
 
   /* Variables that depends on compile options */
 #ifdef HAVE_BROKEN_REALPATH
 
=== modified file 'drizzled/set_var.cc'
--- drizzled/set_var.cc	2010-04-23 01:02:40 +0000
+++ drizzled/set_var.cc	2010-05-23 00:13:27 +0000
@@ -200,6 +200,10 @@
 
 static sys_var_const_str_ptr sys_secure_file_priv(&vars, "secure_file_priv",
                                              &opt_secure_file_priv);
+
+static sys_var_const_str_ptr sys_scheduler(&vars, "scheduler",
+                                           &opt_scheduler);
+
 static sys_var_uint32_t_ptr  sys_server_id(&vars, "server_id", &server_id,
                                            fix_server_id);
 
 
=== modified file 'drizzled/set_var.h'
--- drizzled/set_var.h	2010-05-21 02:16:56 +0000
+++ drizzled/set_var.h	2010-05-23 00:13:27 +0000
@@ -81,6 +81,7 @@
 extern bool opt_readonly;
 extern char* opt_secure_file_priv;
 extern char *default_tz_name;
+extern char *opt_scheduler;
 
 uint64_t fix_unsigned(Session *, uint64_t, const struct option *);