into  mysql.com:/home/my/mysql-5.0

Ensure mysql_close() is called if mysql_set_character_set() fails

into  mysql.com:/home/my/mysql-5.0

Bug #12112

(This is because conds may not be a constant)
This bug caused a failure in the test suite for select.test becasue for prepared statements in one case a 'constant sub query' was not regarded as a constant
Sanja will as a separate task check if we can fix that the sub query can be recognized as a constant
Bug #12217

  potential zlib security vulnerability (CAN-2005-1849). Fix was taken from the
  official zlib-1.2.3 distribution (no other zlib-1.2.3 changes were applied)

into  mysql.com:/home/my/mysql-5.0

Moved test for 'show full processlist' to not_embedded_server.test becasue it could fail on a slow computer where previous connections has not yet disconnected

into  mysql.com:/home/my/mysql-4.1

into  mysql.com:/home/my/mysql-4.1

into  mysql.com:/usr/home/ram/work/mysql-5.0

Change argument order to be database, tablename for some functions

into deer.(none):/home/hf/work/mysql-5.0.clean

into deer.(none):/home/hf/work/mysql-4.1.11329

into deer.(none):/home/hf/work/mysql-5.0.clean

into deer.(none):/home/hf/work/mysql-4.1.9110

into deer.(none):/home/hf/work/mysql-4.1.10839

into deer.(none):/home/hf/work/mysql-4.1.6740

into  hundin.mysql.fi:/home/marko/mysql-5.0

into  hundin.mysql.fi:/home/marko/mysql-4.1

into rurik.mysql.com:/home/igor/dev/mysql-5.0-0

  Post review change in Item_ref::get_tmp_table_field (bug #11412).

Fixed portability problem with bool in C programs
Moved close_thread_tables out from LOCK_thread_count mutex (safety fix)
my_sleep() -> pthread_cond_timedwait()

into  mysql.com:/usr/home/bar/mysql-5.0

into  mysql.com:/usr/home/bar/mysql-4.1.b12109

into  hundin.mysql.fi:/home/marko/mysql-5.0

into  mysql.com:/usr/home/bar/mysql-5.0

ctype-cp932.c:
ctype-gbk.c:
ctype-mb.c:
ctype-simple.c:
ctype-sjis.c:
ctype-ucs2.c:
ctype-ujis.c:
ctype-utf8.c:

  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.

data files.  Previously, writes were flushed until the doublewrite
buffer was created.  That would be too slow on systems where
os_file_flush() [or fsync(2)] is slow.  (Bug #12125)

into  mysql.com:/usr/home/bar/mysql-5.0

item.cc:
  After merge fixes.
func_gconcat.result:
  After merge fixes