From e23d1768a0ac10c58513714489412d180c2ac89d Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 6 Apr 2005 15:52:32 +0300 Subject: [PATCH 1/2] Fixed that create_time is set properly for cached threads --- sql/mysqld.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index d75efbd0b00..c76ccf5daf7 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1488,6 +1488,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; From 57fa327069da8c1119601e427bef69336ba8125e Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 6 Apr 2005 16:52:41 +0300 Subject: [PATCH 2/2] Small fixes done while reviewing pushed code mysql-test/r/innodb-replace.result: Added proper cleanup for test mysql-test/t/innodb-replace.test: Added proper cleanup for test sql/share/english/errmsg.txt: Don't extend the possible length of error message too much for common errors are MySQL 4.0 clients has a limit of 200 characters --- mysql-test/r/innodb-replace.result | 1 + mysql-test/t/innodb-replace.test | 4 ++++ sql/share/english/errmsg.txt | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) 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/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'",