Merge bodhi.local:/opt/local/work/mysql-5.0-runtime

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


configure.in:
  Auto merged
include/my_time.h:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/rename.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/time.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged

mysql-test/t/rename.test

@@ -60,6 +60,9 @@ send RENAME TABLE t1 TO t2, t3 to t4;
 connection con2;
 show tables;
 UNLOCK TABLES;
+connection con1;
+reap;
+connection con2;
 
 # Wait for the the tables to be renamed
 # i.e the query below succeds