=== modified file 'drizzled/drizzled.cc'
--- drizzled/drizzled.cc	2010-09-27 07:06:04 +0000
+++ drizzled/drizzled.cc	2010-09-27 11:09:56 +0000
@@ -222,7 +222,7 @@
 bool volatile abort_loop;
 bool volatile shutdown_in_progress;
 char *opt_scheduler_default;
-char *opt_scheduler= NULL;
+const char *opt_scheduler= NULL;
 
 size_t my_thread_stack_size= 0;
 
@@ -1485,6 +1485,9 @@
     return 1;                           // Eof of the list
   }
 
+  if (vm.count("scheduler"))
+    opt_scheduler= vm["scheduler"].as<string>().c_str();
+
   if (default_collation_name)
   {
     const CHARSET_INFO * const default_collation= get_charset_by_name(default_collation_name);

=== modified file 'drizzled/set_var.cc'
--- drizzled/set_var.cc	2010-09-26 01:35:56 +0000
+++ drizzled/set_var.cc	2010-09-27 08:52:14 +0000
@@ -202,7 +202,7 @@
                                              &opt_secure_file_priv);
 
 static sys_var_const_str_ptr sys_scheduler(&vars, "scheduler",
-                                           &opt_scheduler);
+                                           (char**)&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-06-03 03:33:55 +0000
+++ drizzled/set_var.h	2010-09-27 08:44:44 +0000
@@ -83,7 +83,7 @@
 extern bool opt_readonly;
 extern char* opt_secure_file_priv;
 extern char *default_tz_name;
-extern char *opt_scheduler;
+extern const char *opt_scheduler;
 
 uint64_t fix_unsigned(Session *, uint64_t, const struct option *);