diff --git a/mysql-test/r/innodb-replace.result b/mysql-test/r/innodb-replace.result
index a27806640ad..b7edcc49e56 100644
--- a/mysql-test/r/innodb-replace.result
+++ b/mysql-test/r/innodb-replace.result
@@ -1,3 +1,4 @@
+drop table if exists t1;
 create table t1 (c1 char(5) unique not null, c2 int, stamp timestamp) engine=innodb;
 select * from t1;
 c1	c2	stamp
diff --git a/mysql-test/t/innodb-replace.test b/mysql-test/t/innodb-replace.test
index e7e96da1443..516f058a68e 100644
--- a/mysql-test/t/innodb-replace.test
+++ b/mysql-test/t/innodb-replace.test
@@ -2,6 +2,10 @@
 # embedded server ignores 'delayed', so skip this
 -- source include/not_embedded.inc
 
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
 #
 # Bug #1078
 #
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 43bed35621b..682733abd89 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1492,6 +1492,7 @@ void end_thread(THD *thd, bool put_in_cache)
       thd=thread_cache.get();
       thd->real_id=pthread_self();
       (void) thd->store_globals();
+      thd->thr_create_time= time(NULL);
       threads.append(thd);
       pthread_mutex_unlock(&LOCK_thread_count);
       DBUG_VOID_RETURN;
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 3bfc83a4b41..1ae4e79bf01 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -67,7 +67,7 @@ character-set=latin1
 "Column '%-.64s' cannot be null",
 "Unknown database '%-.64s'",
 "Table '%-.64s' already exists",
-"Unknown table '%-.180s'",
+"Unknown table '%-.100s'",
 "Column '%-.64s' in %-.64s is ambiguous",
 "Server shutdown in progress",
 "Unknown column '%-.64s' in '%-.64s'",