into serg.mylan:/usr/home/serg/Abk/mysql-5.1

per run, failing ALL mysql_real_connect() calls - nobody noticed,
the test always appeared to "pass".

into  mysql.com:/usr/home/bar/mysql-5.1-new.b14527

into mysql.com:/home/hf/work/mysql-5.1.mrg

sql_partition.cc:
  Changeing THD charset to utf8 when parsing a frm file.
partition_charset.test, partition_charset.result:
  new file


sql/sql_partition.cc:
  Bug#14527: Partitions: table unreadable if partition name = c-cedilla
  Changering THD charset to utf8 when parsing
  a frm file.

into  mysql.com:/usr/home/bar/mysql-5.1-new.16315

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

into  mysql.com:/usr/home/bar/mysql-5.1-new.16315


sql/item_xmlfunc.cc:
  Auto merged
mysql-test/r/xml.result:
  After merge fix
mysql-test/t/xml.test:
  After merge fix

into mysql.com:/home/hf/work/mysql-5.1.mrg


mysql-test/r/bigint.result:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged

into serg.mylan:/usr/home/serg/Abk/mysql-5.1


mysql-test/mysql-test-run.sh:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

restore CREATE TABLE ... TYPE=engine until 5.2

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged

- redo log table query for log, split into separate entries per rename, to avoid duplicates, also to only log renames that relate to ndb tables


sql/ha_ndbcluster_binlog.h:
  Bug #17827  	cluster: rename of several tables in one statement, gets multiply logged

This test is being performed by:
1. ctype_cp932_binlog_row.test  and  2. ctype_cp932_binlog_stm.test
Both of these source the file extra/binlog_tests/ctype_cp932_binlog.test


BitKeeper/deleted/.del-ctype_cp932_notembedded.test~3047e508460cef42:
  Delete: mysql-test/t/ctype_cp932_notembedded.test
BitKeeper/deleted/.del-ctype_cp932_notembedded.result~f8bc6ad0446e82e3:
  Delete: mysql-test/r/ctype_cp932_notembedded.result

mysql-test/r/binlog_row_insert_select.result:
  Corrected result file

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new

mysql-test/mysql-test-run.sh:
  binlog_stm_mix_innodb_my depends on umask

BUG#17780: Incorrect result file.  (Test for that part is extra/binlog_tests/binlog_row_ctype_cp932.test)


mysql-test/r/binlog_row_ctype_cp932.result:
  Corrected result file

into  shellback.(none):/home/msvensson/mysql/mysql-5.1


sql/sql_db.cc:
  Auto merged
strings/decimal.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/mysql-5.1

into  shellback.(none):/home/msvensson/mysql/mysql-5.0

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

into  mysql.com:/home/alexi/bugs/mysql-5.0-merged


sql/sql_db.cc:
  Merge

- Run ndb_gis only if we have binlog_format_row


mysql-test/t/ndb_gis.test:
  Run ndb_gis only if we have binlog_format_row

into  shellback.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

Bug #17806 Update on NDB table with list partition causes mysqld to core
- modified complemented_pk_read to be complemented_read, and handle also hidden key


mysql-test/r/ndb_partition_range.result:
  Bug #16385 Partitions: crash when updating a range partitioned NDB table
  Bug #17806 Update on NDB table with list partition causes mysqld to core
mysql-test/t/ndb_partition_range.test:
  Bug #16385 Partitions: crash when updating a range partitioned NDB table
  Bug #17806 Update on NDB table with list partition causes mysqld to core
sql/ha_ndbcluster.h:
  Bug #16385 Partitions: crash when updating a range partitioned NDB table
  Bug #17806 Update on NDB table with list partition causes mysqld to core

 - Change to use non blocking read to empty channel in case of too large sd number
 - Don't check for too large socket number on Windows.


sql/net_serv.cc:
  Windows does not need protection from sd >= FD_SETSIZE, it uses an array to store the sd's it should read from.
  Change the handler for when "net_data_is_ready" returns -1 to perform nonblocking read to empty the net.
  Only include that handler if HAVE_POLL is not defined  and not windows

  Allocating/freeing memory for the db member of THD
  is wholy managed by slave thread.

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

mysql-test/r/bigint.result:
  test result
mysql-test/t/bigint.test:
  testcase
sql/item.h:
  unsigned_arg is a separate parameter now
sql/item_cmpfunc.cc:
  we can get unsigned field from the signed Item - from string
  like '1234'

into  flute.local:/Users/midom/Development/mysql-5.1-new

sql/sql_binlog.cc:
  Initialize event pointer to nil,
  'ev' is used in end: section, thus initialization blocks were skipped

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

sql/field.h:
  Remove multiple definition of "cmp_binary_offset"

xml.result, xml.test:
  Adding test case.
item_xmlfunc.cc:
  Adding a special function to handle "self" axis.
  Previously "child" and "self" were handled the same.


sql/item_xmlfunc.cc:
  Bug#16315 XML: extractvalue() handles self badly
  Adding a special function to handle "self" axis.
  Previously "child" and "self" were handled the same.
mysql-test/t/xml.test:
  Adding test case.
mysql-test/r/xml.result:
  Adding test case.

into  shellback.(none):/home/msvensson/mysql/mysql-5.1


sql/field.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
sql/sql_partition.cc:
  Auto merged