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

into  sanja.is.com.ua:/home/bell/mysql/bk/work-trigger-5.0

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0

into  sanja.is.com.ua:/home/bell/mysql/bk/work-trigger-5.0

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

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0

  Added a test case for bug #12095.
sql_class.h:
  Fixed bug #12095: a join query with GROUP_CONCAT over a single row table.
  Added a flag to the TMP_TABLE_PARAM class forcing to put constant
  items generated after elimination of a single row table into temp table
  in some cases (e.g. when GROUP_CONCAT is calculated over a single row
  table).
  bk ci sql/item_sum.cc
  Fixed bug #12095: a join query with GROUP_CONCAT over a single row table.
  If GROUP_CONCAT is calculated we always put its argument into a temp
  table, even when the argument is a constant item.
sql_select.cc:
  Fixed bug #12095: a join query with GROUP_CONCAT over one row table.
  If temp table is used to calculate GROUP_CONCAT the argument should
  be always put into this table, even when it is a constant item.

Before the fix in ~Prepared_statments we got a memory leak when executing mysql_client_test.test
Note that test 'variables.test' fails.
This will be fixed when Jimw pushes the fix for Bug 10351

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

allowed unintended overflows. (Bug #10351)

  Made the test case for bug #12144 independent on other tests.

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

into mysql.com:/home/psergey/mysql-5.0-28jul-look

  Modified the test case for patch of the bug #12144
  to display status of Handler_read_next before and
  after the tested query.

  Fixed bug #12144.
  Added an optimization that avoids key access with null keys for the 'ref'
  method when used in outer joins. The regilar optimization with adding
  IS NOT NULL expressions is not applied for outer join on expressions as
  the predicates of these expressions are not pushed down in 4.1.
null_key.result, null_key.test:
  Added a test case for bug #12144.

into  sanja.is.com.ua:/home/bell/mysql/bk/work-trigger-5.0

other sql_mode fixes

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

Fix for CAN-2005-1849 from zlib-1.2.3
   (originally:  2005/07/27 14:55:08+02:00 lenz@mysql.com )
Ensure static linking takes the bundled libraries
   (originally:  2005/07/27 16:42:13+02:00 lenz@mysql.com )
Version number change.

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

Ensure mysql_close() is called if mysql_set_character_set() fails

  row_sel_store_mysql_rec(): Make comment about space padding
  more accurate.

correctly.

into mysql.com:/home/gluh/MySQL/Merge/5.0

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