diff --git a/mysql-test/t/events_scheduling.test b/mysql-test/t/events_scheduling.test
index 5b839e25910..31c09a3d561 100644
--- a/mysql-test/t/events_scheduling.test
+++ b/mysql-test/t/events_scheduling.test
@@ -1,6 +1,5 @@
 # Can't test with embedded server that doesn't support grants
 -- source include/not_embedded.inc
--- source include/not_valgrind.inc
 
 CREATE DATABASE IF NOT EXISTS events_test;
 USE events_test;
diff --git a/sql/event_scheduler.cc b/sql/event_scheduler.cc
index fa5cde9a43a..0603a299079 100644
--- a/sql/event_scheduler.cc
+++ b/sql/event_scheduler.cc
@@ -154,8 +154,6 @@ deinit_event_thread(THD *thd)
   thread_running--;
   delete thd;
   pthread_mutex_unlock(&LOCK_thread_count);
-
-  my_thread_end();
 }
 
 
@@ -231,8 +229,7 @@ event_scheduler_thread(void *arg)
   if (!res)
     scheduler->run(thd);
 
-  deinit_event_thread(thd);
-  pthread_exit(0);
+  my_thread_end();
   DBUG_RETURN(0);                               // Against gcc warnings
 }
 
@@ -260,6 +257,7 @@ event_worker_thread(void *arg)
   Event_worker_thread worker_thread;
   worker_thread.run(thd, event);
 
+  my_thread_end();
   return 0;                                     // Can't return anything here
 }
 
@@ -494,12 +492,14 @@ Event_scheduler::run(THD *thd)
     }
     DBUG_PRINT("info", ("state=%s", scheduler_states_names[state].str));
   }
+
   LOCK_DATA();
-  DBUG_PRINT("info", ("Signalling back to the stopper COND_state"));
+  deinit_event_thread(thd);
+  scheduler_thd= NULL;
   state= INITIALIZED;
+  DBUG_PRINT("info", ("Signalling back to the stopper COND_state"));
   pthread_cond_signal(&COND_state);
   UNLOCK_DATA();
-  sql_print_information("Event Scheduler: Stopped");
 
   DBUG_RETURN(res);
 }
@@ -651,17 +651,7 @@ Event_scheduler::stop()
     COND_STATE_WAIT(thd, NULL, "Waiting scheduler to stop");
   } while (state == STOPPING);
   DBUG_PRINT("info", ("Scheduler thread has cleaned up. Set state to INIT"));
-  /*
-    The rationale behind setting it to NULL here but not destructing it
-    beforehand is because the THD will be deinited in event_scheduler_thread().
-    It's more clear when the post_init and the deinit is done in one function.
-    Here we just mark that the scheduler doesn't have a THD anymore. Though for
-    milliseconds the old thread could exist we can't use it anymore. When we
-    unlock the mutex in this function a little later the state will be
-    INITIALIZED. Therefore, a connection thread could enter the critical section
-    and will create a new THD object.
-  */
-  scheduler_thd= NULL;
+  sql_print_information("Event Scheduler: Stopped");
 end:
   UNLOCK_DATA();
   DBUG_RETURN(FALSE);
diff --git a/sql/parse_file.cc b/sql/parse_file.cc
index f5b62e3afe2..f06c7c15202 100644
--- a/sql/parse_file.cc
+++ b/sql/parse_file.cc
@@ -733,14 +733,18 @@ nlist_err:
 
 /*
   parse parameters
- 
+
   SYNOPSIS
     File_parser::parse()
     base                base address for parameter writing (structure like
                         TABLE)
     mem_root            MEM_ROOT for parameters allocation
     parameters          parameters description
-    required            number of required parameters in above list
+    required            number of parameters in the above list. If the file
+                        contains more parameters than "required", they will
+                        be ignored. If the file contains less parameters
+                        then "required", non-existing parameters will
+                        remain their values.
     hook                hook called for unknown keys
     hook_data           some data specific for the hook
 
@@ -923,6 +927,13 @@ list_err:
       }
     }
   }
+
+  /*
+    NOTE: if we read less than "required" parameters, it is still Ok.
+    Probably, we've just read the file of the previous version, which
+    contains less parameters.
+  */
+
   DBUG_RETURN(FALSE);
 }
 
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index cb19e800510..4dcdddbdef8 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -992,6 +992,12 @@ sp_head::execute(THD *thd)
                m_first_instance->m_last_cached_sp == this) ||
               (m_recursion_level + 1 == m_next_cached_sp->m_recursion_level));
 
+  /*
+    NOTE: The SQL Standard does not specify the context that should be
+    preserved for stored routines. However, at SAP/Walldorf meeting it was
+    decided that current database should be preserved.
+  */
+
   if (m_db.length &&
       (err_status= sp_use_new_db(thd, m_db, &old_db, 0, &dbchanged)))
     goto done;