Merge

2 files changed, 2 insertions, 0 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 422d27ec624..5d4339d3ca6 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -3563,6 +3563,7 @@ static void get_options(int argc,char **argv)
       break;
     case OPT_LOW_PRIORITY_UPDATES:
       thd_startup_options|=OPTION_LOW_PRIORITY_UPDATES;
+      thr_upgraded_concurrent_insert_lock= TL_WRITE_LOW_PRIORITY;
       low_priority_updates=1;
       break;
     case OPT_BOOTSTRAP:
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 14f4a732eac..50e4a6dedd4 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -871,6 +871,7 @@ static pthread_handler_decl(handle_delayed_insert,arg)
   /* Add thread to THD list so that's it's visible in 'show processlist' */
   pthread_mutex_lock(&LOCK_thread_count);
   thd->thread_id=thread_id++;
+  thd->end_time();
   threads.append(thd);
   pthread_mutex_unlock(&LOCK_thread_count);